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

c36113cd

Commit c36113cd authored 4 years ago by lain

Downloads
- Plain Diff

Merge branch 'revert-2b5d9eb1' into 'develop'

Revert "Merge branch 'linkify' into 'develop'"

See merge request pleroma/pleroma!2784

parents 2b5d9eb1 696c13ce

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 0 additions, 1 deletion

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

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

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

docs/configuration/cheatsheet.md
lib/pleroma/config/config_db.ex 1 addition, 0 deletions

lib/pleroma/config/config_db.ex
lib/pleroma/formatter.ex 11 additions, 15 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 3 additions, 1 deletion

mix.exs
mix.lock 1 addition, 1 deletion

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

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

test/formatter_test.exs

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