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

1c3d3d0c

Commit 1c3d3d0c authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'safe-mentions' into 'develop'

Add safe dm mode option.

See merge request pleroma/pleroma!958

parents b548181b bf27190f

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 2 additions, 1 deletion

config/config.exs
docs/config.md 2 additions, 1 deletion

docs/config.md
lib/pleroma/formatter.ex 17 additions, 3 deletions

lib/pleroma/formatter.ex
lib/pleroma/web/common_api/common_api.ex 2 additions, 1 deletion

lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex 10 additions, 2 deletions

lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex 3 additions, 1 deletion

lib/pleroma/web/twitter_api/controllers/util_controller.ex
test/formatter_test.exs 25 additions, 0 deletions

test/formatter_test.exs
test/web/common_api/common_api_test.exs 18 additions, 0 deletions

test/web/common_api/common_api_test.exs
test/web/twitter_api/util_controller_test.exs 23 additions, 0 deletions

test/web/twitter_api/util_controller_test.exs

with 102 additions and 9 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