Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

2b5d9eb1

Commit 2b5d9eb1 authored 4 years ago by lain

Downloads
- Plain Diff

Merge branch 'linkify' into 'develop'

AutoLinker --> Linkify, update to latest version

See merge request pleroma/pleroma!2677

parents fa2421dd 204dddcf

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
config/config.exs 8 additions, 10 deletions

config/config.exs
config/description.exs 14 additions, 6 deletions

config/description.exs
docs/configuration/cheatsheet.md 17 additions, 18 deletions

docs/configuration/cheatsheet.md
lib/pleroma/config/config_db.ex 0 additions, 1 deletion

lib/pleroma/config/config_db.ex
lib/pleroma/formatter.ex 15 additions, 11 deletions

lib/pleroma/formatter.ex
lib/pleroma/web/rich_media/helpers.ex 2 additions, 2 deletions

lib/pleroma/web/rich_media/helpers.ex
mix.exs 1 addition, 3 deletions

mix.exs
mix.lock 1 addition, 1 deletion

mix.lock
priv/repo/migrations/20200716195806_autolinker_to_linkify.exs 37 additions, 0 deletions

.../repo/migrations/20200716195806_autolinker_to_linkify.exs
test/formatter_test.exs 30 additions, 0 deletions

test/formatter_test.exs

with 126 additions and 52 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