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

d63dca8d

Commit d63dca8d authored 5 years ago by lain

Downloads
- Plain Diff

Merge branch 'feature/1635-notifications-include-types' into 'develop'

include_types parameter in /api/v1/notifications

Closes #1635

See merge request !2311

parents 952cb589 98a60df4

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 7 additions, 0 deletions

CHANGELOG.md
docs/API/differences_in_mastoapi_responses.md 1 addition, 0 deletions

docs/API/differences_in_mastoapi_responses.md
lib/pleroma/web/mastodon_api/mastodon_api.ex 16 additions, 6 deletions

lib/pleroma/web/mastodon_api/mastodon_api.ex
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex 1 addition, 0 deletions

lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
test/web/mastodon_api/controllers/notification_controller_test.exs 45 additions, 0 deletions

...mastodon_api/controllers/notification_controller_test.exs

with 70 additions and 6 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