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

556da929

Commit 556da929 authored 5 years ago by lain

Downloads
- Plain Diff

Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'

Store status data inside flag activity

See merge request pleroma/pleroma!1849

parents bab786cd d56bc622

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 2 additions, 1 deletion

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

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/utils.ex 42 additions, 4 deletions

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

lib/pleroma/web/admin_api/report.ex
test/web/activity_pub/activity_pub_test.exs 94 additions, 29 deletions

test/web/activity_pub/activity_pub_test.exs
test/web/activity_pub/transmogrifier_test.exs 11 additions, 2 deletions

test/web/activity_pub/transmogrifier_test.exs
test/web/activity_pub/utils_test.exs 10 additions, 1 deletion

test/web/activity_pub/utils_test.exs
test/web/common_api/common_api_test.exs 15 additions, 1 deletion

test/web/common_api/common_api_test.exs

with 179 additions and 41 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