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

4ae0a665

Commit 4ae0a665 authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'admin-fixes' into 'develop'

Admin fixes

See merge request pleroma/pleroma!1524

parents 99ce6d60 de0f3b73

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

docs/api/admin_api.md 4 additions, 0 deletions

docs/api/admin_api.md
lib/pleroma/web/admin_api/admin_api_controller.ex 3 additions, 3 deletions

lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/admin_api/config.ex 13 additions, 2 deletions

lib/pleroma/web/admin_api/config.ex
test/web/admin_api/admin_api_controller_test.exs 32 additions, 0 deletions

test/web/admin_api/admin_api_controller_test.exs

with 52 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