diff options
| author | lain <lain@soykaf.club> | 2019-11-10 14:25:09 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-10 14:25:09 +0000 |
| commit | 7438c177d9f57e8779b979ca553c3b501726efb3 (patch) | |
| tree | 0cb9fd86e1b2cdec12c2993190ed9e0ddc278380 | |
| parent | 3a1aaadc18372fb8c76fa72cd20ed65dd85b2326 (diff) | |
| parent | 4499a7a0751ec992a78a1023e8e34300f06e14b1 (diff) | |
| download | pleroma-7438c177d9f57e8779b979ca553c3b501726efb3.tar.gz pleroma-7438c177d9f57e8779b979ca553c3b501726efb3.zip | |
Merge branch 'disable-attachment-links' into 'develop'
Disable attachment links by default
Closes #1394
See merge request pleroma/pleroma!1962
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | config/config.exs | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1eb7d14cd..4ec084dbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - **Breaking:** Elixir >=1.8 is now required (was >= 1.7) +- **Breaking:** attachment links (`config :pleroma, :instance, no_attachment_links` and `config :pleroma, Pleroma.Upload, link_name`) disabled by default - Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings) - Introduced [quantum](https://github.com/quantum-elixir/quantum-core) job scheduler - Enabled `:instance, extended_nickname_format` in the default config diff --git a/config/config.exs b/config/config.exs index 7e1fe2a81..54de8fa9f 100644 --- a/config/config.exs +++ b/config/config.exs @@ -90,7 +90,7 @@ config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank. config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, filters: [Pleroma.Upload.Filter.Dedupe], - link_name: true, + link_name: false, proxy_remote: false, proxy_opts: [ redirect_on_failure: false, @@ -257,7 +257,7 @@ config :pleroma, :instance, mrf_transparency_exclusions: [], autofollowed_nicknames: [], max_pinned_statuses: 1, - no_attachment_links: false, + no_attachment_links: true, welcome_user_nickname: nil, welcome_message: nil, max_report_comment_size: 1000, |