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

aa718ab8

Commit aa718ab8 authored 5 years ago by Haelwenn

Downloads
- Plain Diff

Merge branch 'fix/object-reembeds' into 'develop'

Do not rembed the object after updating it

Closes #1142

See merge request pleroma/pleroma!1538

parents dea3bd02 4f1b9c54

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex 2 additions, 2 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/utils.ex 1 addition, 16 deletions

lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/ostatus/activity_representer.ex 2 additions, 1 deletion

lib/pleroma/web/ostatus/activity_representer.ex
test/web/activity_pub/activity_pub_test.exs 0 additions, 6 deletions

test/web/activity_pub/activity_pub_test.exs
test/web/ostatus/ostatus_test.exs 1 addition, 1 deletion

test/web/ostatus/ostatus_test.exs

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