diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-12-19 11:33:10 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-12-19 11:33:10 -0600 |
| commit | e4f9cb1c1b3969164c03a219d5a760df07d2b3cd (patch) | |
| tree | d9549feae7691be9988106f2a92ea387b3fdeaf2 /config | |
| parent | 720198d56950ca98f4d947dd630b0e170eda569b (diff) | |
| parent | bd853199d93e03fedf43397455939c6d633fa36b (diff) | |
| download | pleroma-e4f9cb1c1b3969164c03a219d5a760df07d2b3cd.tar.gz pleroma-e4f9cb1c1b3969164c03a219d5a760df07d2b3cd.zip | |
Merge remote-tracking branch 'origin/develop' into manifest
Diffstat (limited to 'config')
| -rw-r--r-- | config/benchmark.exs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/benchmark.exs b/config/benchmark.exs index a4d048f1b..9a7ea5669 100644 --- a/config/benchmark.exs +++ b/config/benchmark.exs @@ -4,8 +4,7 @@ import Config # you can enable the server option below. config :pleroma, Pleroma.Web.Endpoint, http: [port: 4001], - url: [port: 4001], - server: true + url: [port: 4001] # Disable captha for tests config :pleroma, Pleroma.Captcha, @@ -44,7 +43,7 @@ config :pleroma, Pleroma.Repo, pool_size: 10 # Reduce hash rounds for testing -config :pbkdf2_elixir, rounds: 1 +config :pleroma, :password, iterations: 1 config :tesla, adapter: Tesla.Mock |