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

92d08d41

Commit 92d08d41 authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'split-masto-api/follow-requests' into 'develop'

Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`

See merge request !1730

parents 68bf99ba 99c5a358

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/mastodon_api/controllers/follow_request_controller.ex 49 additions, 0 deletions

...web/mastodon_api/controllers/follow_request_controller.ex
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex 0 additions, 36 deletions

...a/web/mastodon_api/controllers/mastodon_api_controller.ex
lib/pleroma/web/router.ex 3 additions, 3 deletions

lib/pleroma/web/router.ex
test/web/mastodon_api/controllers/follow_request_controller_test.exs 81 additions, 0 deletions

...stodon_api/controllers/follow_request_controller_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs 0 additions, 67 deletions

test/web/mastodon_api/mastodon_api_controller_test.exs

with 133 additions and 106 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