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

bdc7b606

Commit bdc7b606 authored 4 years ago by Haelwenn

Downloads
- Plain Diff

Merge branch '1925-muting-reblogs' into 'develop'

AccountController: Fix muting / unmuting reblogs.

Closes #1925

See merge request pleroma/pleroma!2732

parents 68036f5a c0385cf4

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/api_spec/operations/account_operation.ex 16 additions, 7 deletions

lib/pleroma/web/api_spec/operations/account_operation.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex 1 addition, 1 deletion

...leroma/web/mastodon_api/controllers/account_controller.ex
test/web/mastodon_api/controllers/account_controller_test.exs 35 additions, 2 deletions

.../web/mastodon_api/controllers/account_controller_test.exs

with 52 additions and 10 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