Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

c02e6cee

Commit c02e6cee authored 4 years ago by lain

Downloads
- Plain Diff

Merge branch 'revert-60cc7d6c' into 'develop'

Revert "Merge branch 'issue/1276' into 'develop'"

See merge request pleroma/pleroma!2384

parents 3677a1e5 45765204

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 0 additions, 1 deletion

CHANGELOG.md
docs/API/differences_in_mastoapi_responses.md 5 additions, 12 deletions

docs/API/differences_in_mastoapi_responses.md
lib/pleroma/marker.ex 1 addition, 44 deletions

lib/pleroma/marker.ex
lib/pleroma/notification.ex 13 additions, 34 deletions

lib/pleroma/notification.ex
lib/pleroma/web/mastodon_api/views/marker_view.ex 1 addition, 4 deletions

lib/pleroma/web/mastodon_api/views/marker_view.ex
mix.lock 24 additions, 26 deletions

mix.lock
priv/repo/migrations/20200210050658_update_markers.exs 0 additions, 39 deletions

priv/repo/migrations/20200210050658_update_markers.exs
test/marker_test.exs 1 addition, 28 deletions

test/marker_test.exs
test/notification_test.exs 0 additions, 13 deletions

test/notification_test.exs
test/web/mastodon_api/controllers/marker_controller_test.exs 3 additions, 7 deletions

test/web/mastodon_api/controllers/marker_controller_test.exs
test/web/mastodon_api/views/marker_view_test.exs 3 additions, 5 deletions

test/web/mastodon_api/views/marker_view_test.exs

with 51 additions and 213 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment