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

9b63fda9

Commit 9b63fda9 authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'

[#675] Do not show DMs in mentions timeline

See merge request pleroma/pleroma!877

parents f38c316e 9c6abec4

No related branches found

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 24 additions, 0 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 1 addition, 0 deletions

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

test/web/activity_pub/activity_pub_test.exs
test/web/twitter_api/twitter_api_controller_test.exs 21 additions, 1 deletion

test/web/twitter_api/twitter_api_controller_test.exs

with 54 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