Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members

Snippets Groups Projects

d1549a63

Commit d1549a63 authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'

Merge admin and mastodon user views for reports

See merge request pleroma/pleroma!1346

parents f375c2fd 90927e6a

Branches

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/admin_api/views/account_view.ex 8 additions, 0 deletions

lib/pleroma/web/admin_api/views/account_view.ex
lib/pleroma/web/admin_api/views/report_view.ex 7 additions, 3 deletions

lib/pleroma/web/admin_api/views/report_view.ex
test/web/admin_api/admin_api_controller_test.exs 65 additions, 21 deletions

test/web/admin_api/admin_api_controller_test.exs
test/web/admin_api/views/report_view_test.exs 20 additions, 4 deletions

test/web/admin_api/views/report_view_test.exs

with 100 additions and 28 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