Merge branch 'develop' into activation-meta

[akkoma] / test / fixtures / config / temp.secret.exs

diff --git a/test/fixtures/config/temp.secret.exs b/test/fixtures/config/temp.secret.exs
index f4686c101964ab4a18e4d830608cc0f1190ec9d8..fa8c7c7e85ef3ceefedc6d42f0c51d2f3ef340c2 100644 (file)
--- a/test/fixtures/config/temp.secret.exs
+++ b/test/fixtures/config/temp.secret.exs
@@ -7,3 +7,7 @@ config :pleroma, :second_setting, key: "value2", key2: ["Activity"]
 config :quack, level: :info
 
 config :pleroma, Pleroma.Repo, pool: Ecto.Adapters.SQL.Sandbox
+
+config :postgrex, :json_library, Poison
+
+config :pleroma, :database, rum_enabled: true