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

926bf114

Commit 926bf114 authored 5 years ago by lain

Downloads
- Plain Diff

Merge branch 'feature/more-user-filters' into 'develop'

Add more user filters + move search to its own module

See merge request pleroma/pleroma!982

parents a5f141d9 3cf7539b

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

docs/Admin-API.md 17 additions, 6 deletions

docs/Admin-API.md
lib/pleroma/user.ex 37 additions, 47 deletions

lib/pleroma/user.ex
lib/pleroma/web/admin_api/admin_api_controller.ex 25 additions, 11 deletions

lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/admin_api/search.ex 54 additions, 0 deletions

lib/pleroma/web/admin_api/search.ex
test/user_test.exs 1 addition, 17 deletions

test/user_test.exs
test/web/admin_api/admin_api_controller_test.exs 34 additions, 6 deletions

test/web/admin_api/admin_api_controller_test.exs
test/web/admin_api/search_test.exs 88 additions, 0 deletions

test/web/admin_api/search_test.exs

with 256 additions and 87 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