diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-15 17:11:00 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-15 17:11:00 +0300 |
| commit | 273905744242b013ba9736ff7e1415a0499022d1 (patch) | |
| tree | 146f5ad5428130dce0076ea9f6398035d7ac88f6 /config | |
| parent | aacbf0f57053786533df045125dee93ace0daa93 (diff) | |
| parent | 41fc67aa4993c119dae82578df7309d3999ac47a (diff) | |
| download | pleroma-273905744242b013ba9736ff7e1415a0499022d1.tar.gz pleroma-273905744242b013ba9736ff7e1415a0499022d1.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index 1ddc1bad1..28867ed4c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -35,6 +35,7 @@ config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank. config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, filters: [], + link_name: true, proxy_remote: false, proxy_opts: [ redirect_on_failure: false, diff --git a/config/test.exs b/config/test.exs index 6dfa698c8..a3f36c9e1 100644 --- a/config/test.exs +++ b/config/test.exs @@ -17,6 +17,8 @@ config :pleroma, Pleroma.Captcha, # Print only warnings and errors during test config :logger, level: :warn +config :pleroma, Pleroma.Upload, link_name: false + config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Test |