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

f2216287

Commit f2216287 authored 5 years ago by feld

Downloads
- Plain Diff

Merge branch 'admin-status-list' into 'develop'

Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)

Closes #1550

See merge request pleroma/pleroma!2192

parents ab0aa04e e2a6a403

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex 8 additions, 3 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/admin_api/admin_api_controller.ex 19 additions, 1 deletion

lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/admin_api/views/status_view.ex 1 addition, 1 deletion

lib/pleroma/web/admin_api/views/status_view.ex
lib/pleroma/web/router.ex 1 addition, 0 deletions

lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs 46 additions, 0 deletions

test/web/admin_api/admin_api_controller_test.exs

with 76 additions and 5 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