Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

2029de50

Commit 2029de50 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'unify-accept-reject-unfollow' into 'develop'

Unify unfollow, accept and reject follow requests using CommonAPI

See merge request pleroma/pleroma!931

parents 92a0210f e416c344

Branches

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/common_api/common_api.ex 36 additions, 0 deletions

lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 3 additions, 22 deletions

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/twitter_api.ex 1 addition, 4 deletions

lib/pleroma/web/twitter_api/twitter_api.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 2 additions, 20 deletions

lib/pleroma/web/twitter_api/twitter_api_controller.ex

with 42 additions and 46 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