diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-21 20:20:35 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-21 20:20:35 +0300 |
| commit | 2634a16b4cefebfb2a13550bde3fd12e5acd9aaa (patch) | |
| tree | 1c43808f90f13a9e055464f01e4c8a36b28fe50b /config/test.exs | |
| parent | b830605577f369d6b1a8730a5b3476ceea4fef5a (diff) | |
| parent | d8860eaee46c9bc0a079e90dfb008c54923d7330 (diff) | |
| download | pleroma-2634a16b4cefebfb2a13550bde3fd12e5acd9aaa.tar.gz pleroma-2634a16b4cefebfb2a13550bde3fd12e5acd9aaa.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/config/test.exs b/config/test.exs index 7fc457463..690c98e40 100644 --- a/config/test.exs +++ b/config/test.exs @@ -53,7 +53,7 @@ config :pleroma, Pleroma.Repo, config :pleroma, :dangerzone, override_repo_pool_size: true # Reduce hash rounds for testing -config :pbkdf2_elixir, rounds: 1 +config :pleroma, :password, iterations: 1 config :tesla, adapter: Tesla.Mock @@ -115,11 +115,6 @@ config :pleroma, Pleroma.Web.Plugs.RemoteIp, enabled: false config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true -config :pleroma, Pleroma.Uploaders.S3, - bucket: nil, - streaming_enabled: true, - public_endpoint: nil - config :tzdata, :autoupdate, :disabled config :pleroma, :mrf, policies: [] |