summaryrefslogtreecommitdiff
path: root/config/benchmark.exs
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-12-07 13:41:54 -0500
committerAlex Gleason <alex@alexgleason.me>2021-12-07 13:41:54 -0500
commit2c96668a2c20906e5159fdea9326dbba4ca6ca62 (patch)
treee7fc1def45d51ba8011c1cfacb28c2523279e09b /config/benchmark.exs
parent335684182a094c10fb9f72e3865fd1b9606484a4 (diff)
parentb57041c59a14df78b4a461e68911a9edc788bc0a (diff)
downloadpleroma-2c96668a2c20906e5159fdea9326dbba4ca6ca62.tar.gz
pleroma-2c96668a2c20906e5159fdea9326dbba4ca6ca62.zip
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
Diffstat (limited to 'config/benchmark.exs')
-rw-r--r--config/benchmark.exs5
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