Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

0fe715f3

Commit 0fe715f3 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'chore/merge-search-into-list-users' into 'develop'

Merge search endpoint into /users

See merge request !898

parents 39b766cc 76160122

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

docs/Admin-API.md 5 additions, 30 deletions

docs/Admin-API.md
lib/pleroma/user.ex 30 additions, 17 deletions

lib/pleroma/user.ex
lib/pleroma/web/admin_api/admin_api_controller.ex 4 additions, 18 deletions

lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/router.ex 0 additions, 1 deletion

lib/pleroma/web/router.ex
test/web/admin_api/admin_api_controller_test.exs 50 additions, 23 deletions

test/web/admin_api/admin_api_controller_test.exs

with 89 additions and 89 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