summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-05-23 09:03:11 +0000
committerlambda <pleromagit@rogerbraun.net>2018-05-23 09:03:11 +0000
commit06c97f211fc4a8c9c9c7e77143c3398ade817ab4 (patch)
tree4ce968502f30a8b4365fe78776cf5ca3cbe1b23a /config/test.exs
parentf0e8194a7129b6885ad74a694157e10e29f20807 (diff)
parente55c6f311b8f459402134351230a5ff9700a8ff0 (diff)
downloadpleroma-06c97f211fc4a8c9c9c7e77143c3398ade817ab4.tar.gz
pleroma-06c97f211fc4a8c9c9c7e77143c3398ade817ab4.zip
Merge branch 'feature/deps-migration' into 'develop'
Migrate to comeonin 4 and Cachex 3 See merge request pleroma/pleroma!162
Diffstat (limited to 'config/test.exs')
-rw-r--r--config/test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs
index 0c73f892a..1bd11dee4 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -21,7 +21,7 @@ config :pleroma, Pleroma.Repo,
pool: Ecto.Adapters.SQL.Sandbox
# Reduce hash rounds for testing
-config :comeonin, :pbkdf2_rounds, 1
+config :pbkdf2_elixir, rounds: 1
config :pleroma, :websub, Pleroma.Web.WebsubMock
config :pleroma, :ostatus, Pleroma.Web.OStatusMock