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

61bcd459

Commit 61bcd459 authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'feature/fast_sanitize' into 'develop'

Switching to FastSanitize

See merge request pleroma/pleroma!1916

parents 9d8da9ea 55ef88ef

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 3 additions, 2 deletions

config/config.exs
lib/pleroma/bbs/handler.ex 2 additions, 1 deletion

lib/pleroma/bbs/handler.ex
lib/pleroma/html.ex 71 additions, 72 deletions

lib/pleroma/html.ex
mix.exs 4 additions, 2 deletions

mix.exs
mix.lock 26 additions, 23 deletions

mix.lock
test/emoji/formatter_test.exs 2 additions, 5 deletions

test/emoji/formatter_test.exs
test/html_test.exs 22 additions, 22 deletions

test/html_test.exs
test/web/activity_pub/mrf/normalize_markup_test.exs 5 additions, 5 deletions

test/web/activity_pub/mrf/normalize_markup_test.exs
test/web/common_api/common_api_test.exs 2 additions, 2 deletions

test/web/common_api/common_api_test.exs
test/web/mastodon_api/views/status_view_test.exs 5 additions, 4 deletions

test/web/mastodon_api/views/status_view_test.exs

with 142 additions and 138 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