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

1b0e47b7

Commit 1b0e47b7 authored 2 years ago by tusooa

Downloads
- Plain Diff

Merge branch 'from/upstream-develop/tusooa/no-strip-report' into 'develop'

Give admin the choice to not strip reported statuses

Closes #2887

See merge request pleroma/pleroma!3773

parents 7c8618dc e3e68b93

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 1 addition, 0 deletions

config/config.exs
config/description.exs 6 additions, 0 deletions

config/description.exs
docs/configuration/cheatsheet.md 1 addition, 0 deletions

docs/configuration/cheatsheet.md
lib/pleroma/web/activity_pub/utils.ex 11 additions, 12 deletions

lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/admin_api/report.ex 35 additions, 2 deletions

lib/pleroma/web/admin_api/report.ex
test/pleroma/web/admin_api/controllers/report_controller_test.exs 26 additions, 0 deletions

...roma/web/admin_api/controllers/report_controller_test.exs
test/pleroma/web/common_api_test.exs 26 additions, 0 deletions

test/pleroma/web/common_api_test.exs

with 106 additions and 14 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