summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2019-02-03 18:19:40 +0000
committerlambda <pleromagit@rogerbraun.net>2019-02-03 18:19:40 +0000
commit69a38644bc20f49390717f06be30cc2874f7b6f7 (patch)
tree68db3940ef91d35e1dc83f175716f126e15db716 /config/test.exs
parent8180de951e2ac1efc6cfb9f64d078d6a1b7d0c0e (diff)
parente61f0be9518aff867f4c56f5102723eddbcf40f1 (diff)
downloadpleroma-69a38644bc20f49390717f06be30cc2874f7b6f7.tar.gz
pleroma-69a38644bc20f49390717f06be30cc2874f7b6f7.zip
Merge branch '589-fix-cache' into 'develop'
Resolve "Update object cache on favs/boosts" Closes #589 See merge request pleroma/pleroma!764
Diffstat (limited to 'config/test.exs')
-rw-r--r--config/test.exs1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs
index 67ed4737f..412970d93 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -36,6 +36,7 @@ config :pbkdf2_elixir, rounds: 1
config :pleroma, :websub, Pleroma.Web.WebsubMock
config :pleroma, :ostatus, Pleroma.Web.OStatusMock
config :tesla, adapter: Tesla.Mock
+config :pleroma, :rich_media, enabled: false
config :web_push_encryption, :vapid_details,
subject: "mailto:administrator@example.com",