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

df846eda

Commit df846eda authored 4 years ago by lain

Downloads
- Plain Diff

Merge branch 'bugfix/sensitive_object' into 'develop'

Transmogrifier.set_sensitive/1: Keep sensitive set to true

Closes #954

See merge request pleroma/pleroma!2470

parents c3f1ce80 bf0e41f0

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
lib/pleroma/web/activity_pub/transmogrifier.ex 4 additions, 0 deletions

lib/pleroma/web/activity_pub/transmogrifier.ex
test/web/activity_pub/activity_pub_controller_test.exs 15 additions, 7 deletions

test/web/activity_pub/activity_pub_controller_test.exs

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