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

1c265b3b

Commit 1c265b3b authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'auto_linker' into 'develop'

AutoLinker

Closes #609

See merge request pleroma/pleroma!839

parents e9703a53 c3ac9424

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 10 additions, 0 deletions

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

docs/config.md
lib/pleroma/formatter.ex 56 additions, 140 deletions

lib/pleroma/formatter.ex
lib/pleroma/user.ex 2 additions, 4 deletions

lib/pleroma/user.ex
lib/pleroma/web/common_api/common_api.ex 4 additions, 24 deletions

lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex 45 additions, 41 deletions

lib/pleroma/web/common_api/utils.ex
mix.exs 4 additions, 1 deletion

mix.exs
mix.lock 1 addition, 0 deletions

mix.lock
test/formatter_test.exs 40 additions, 74 deletions

test/formatter_test.exs
test/web/common_api/common_api_utils_test.exs 25 additions, 7 deletions

test/web/common_api/common_api_utils_test.exs

with 213 additions and 292 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