diff options
author | Mark Felder <feld@feld.me> | 2018-05-04 21:02:14 +0000 |
---|---|---|
committer | Mark Felder <feld@feld.me> | 2018-05-04 21:02:14 +0000 |
commit | 5855ffd322212e5ba7110a118e7aa889786d9e38 (patch) | |
tree | 85b641024e4f2038a3f2d8bf1981b9f22f31c7e2 | |
parent | ab4aa5720aeac8541fbf99e6c98e7260cb19d41e (diff) | |
parent | d30907e573ca7771cf14a4ae5f766e09a16b5395 (diff) | |
download | pleroma-5855ffd322212e5ba7110a118e7aa889786d9e38.tar.gz |
Merge branch 'feld-test.secret' into feld-warnings
-rw-r--r-- | config/test.exs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index e0461e93d..e13696d5c 100644 --- a/config/test.exs +++ b/config/test.exs @@ -26,3 +26,12 @@ config :comeonin, :pbkdf2_rounds, 1 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 paramenters." + ) +end |