diff options
| author | lain <lain@soykaf.club> | 2019-06-05 11:05:32 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-06-05 11:05:32 +0000 |
| commit | eda4b00a6a76dc282fe83582e7e24209379d4025 (patch) | |
| tree | 9df0f775899a1d66d5a96127807c3d631d2e8f0d /config | |
| parent | e4babb1c9ff4c28ff08888736cc330a48b19b396 (diff) | |
| parent | 3eefb274f45e57ad855246cb930a6a094eeffe0e (diff) | |
| download | pleroma-eda4b00a6a76dc282fe83582e7e24209379d4025.tar.gz pleroma-eda4b00a6a76dc282fe83582e7e24209379d4025.zip | |
Merge branch 'oauth_consumer_support_code' into 'develop'
OAuth consumer: tests fix, comments, Keycloak config notes
See merge request pleroma/pleroma!1248
Diffstat (limited to 'config')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index 41cddb9bd..7861b9598 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" |