diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-07 01:20:50 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-07 01:20:50 +0300 |
| commit | 01fe5abad1a98b98a0dd5e3c04bf65809389fd78 (patch) | |
| tree | b829b75c225b8ffbacd22884693a622dc7584a70 /config | |
| parent | b1b1a270e8f17b76d08771ca1e4025b1d227da05 (diff) | |
| parent | 62cdf701f47352004c293c3ca049d232b3d16af7 (diff) | |
| download | pleroma-01fe5abad1a98b98a0dd5e3c04bf65809389fd78.tar.gz pleroma-01fe5abad1a98b98a0dd5e3c04bf65809389fd78.zip | |
Resolve conflicts
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/test.exs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index d52f594e8..5a05ee043 100644 --- a/config/config.exs +++ b/config/config.exs @@ -244,7 +244,8 @@ config :pleroma, :instance, safe_dm_mentions: false, healthcheck: false, remote_post_retention_days: 90, - skip_thread_containment: false + skip_thread_containment: false, + limit_unauthenticated_to_local_content: true config :pleroma, :app_account_creation, enabled: true, max_requests: 25, interval: 1800 diff --git a/config/test.exs b/config/test.exs index adb874223..cecb16184 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, :auth, oauth_consumer_strategies: [] + config :pleroma, Pleroma.Upload, filters: [], link_name: false config :pleroma, Pleroma.Uploaders.Local, uploads: "test/uploads" |