Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

44762daf

Commit 44762daf authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'feature/broken-thread-filtering' into 'develop'

broken thread filtering, part 1

See merge request pleroma/pleroma!394

parents 9b396706 2ac13061

Branches

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/activity_pub/activity_pub.ex 33 additions, 0 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 1 addition, 0 deletions

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 3 additions, 1 deletion

lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/activity_pub/activity_pub_test.exs 48 additions, 0 deletions

test/web/activity_pub/activity_pub_test.exs

with 85 additions and 1 deletion

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