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

bfeb33e9

Commit bfeb33e9 authored 5 years ago by Alexander Strizhakov Committed by kaniini 5 years ago

Downloads
- Patches
- Plain Diff

Merge develop

Merge conflict in lib/pleroma/activity.ex

parent 289b8224

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
docs/api/admin_api.md 7 additions, 2 deletions

docs/api/admin_api.md
lib/pleroma/activity.ex 23 additions, 0 deletions

lib/pleroma/activity.ex
lib/pleroma/stats.ex 6 additions, 3 deletions

lib/pleroma/stats.ex
lib/pleroma/user.ex 40 additions, 156 deletions

lib/pleroma/user.ex
lib/pleroma/user/query.ex 150 additions, 0 deletions

lib/pleroma/user/query.ex
lib/pleroma/web/admin_api/admin_api_controller.ex 6 additions, 3 deletions

lib/pleroma/web/admin_api/admin_api_controller.ex
lib/pleroma/web/admin_api/search.ex 11 additions, 33 deletions

lib/pleroma/web/admin_api/search.ex
test/web/admin_api/admin_api_controller_test.exs 223 additions, 57 deletions

test/web/admin_api/admin_api_controller_test.exs
test/web/admin_api/search_test.exs 84 additions, 2 deletions

test/web/admin_api/search_test.exs

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