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

2d54fdcd

Commit 2d54fdcd authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'fix/follow-with-reblogs' into 'develop'

Handle `reblogs` on the first follow request

See merge request pleroma/pleroma!1076

parents e48848da fa485323

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
lib/pleroma/web/mastodon_api/mastodon_api.ex 27 additions, 1 deletion

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

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
test/web/mastodon_api/mastodon_api_controller_test.exs 38 additions, 0 deletions

test/web/mastodon_api/mastodon_api_controller_test.exs

with 67 additions and 16 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