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

ab0aa04e

Commit ab0aa04e authored 5 years ago by feld

Downloads
- Plain Diff

Merge branch 'exclude-boosts-admin-api' into 'develop'

Admin API: filter out boosts from recent statuses

Closes #1589

See merge request !2248

parents fda6f35a 4ab07cf0

Branches

Tags

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
docs/API/admin_api.md 14 additions, 0 deletions

docs/API/admin_api.md
lib/pleroma/web/admin_api/admin_api_controller.ex 6 additions, 2 deletions

lib/pleroma/web/admin_api/admin_api_controller.ex
test/web/admin_api/admin_api_controller_test.exs 25 additions, 1 deletion

test/web/admin_api/admin_api_controller_test.exs

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