Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

2018-05-05 13:41:27 +02:00 · 2018-05-05 13:41:27 +02:00 · 1e83727fdd
commit 1e83727fdd
parent 9810153aeb c8ba7501b7
1 changed files with 9 additions and 0 deletions
--- a/config/test.exs
+++ b/config/test.exs
@ -26,3 +26,12 @@
 config :pleroma, :websub, Pleroma.Web.WebsubMock
 config :pleroma, :ostatus, Pleroma.Web.OStatusMock
 config :pleroma, :httpoison, HTTPoisonMock
+
+try do
+  import_config "test.secret.exs"
+rescue
+  _ ->
+    IO.puts(
+      "You may want to create test.secret.exs to declare custom database connection parameters."
+    )
+end