diff options
| author | lain <lain@soykaf.club> | 2018-05-05 13:41:27 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-05-05 13:41:27 +0200 |
| commit | 1e83727fdd61de05d734e8395996cb695c4b1e15 (patch) | |
| tree | 4a42e949075fa79a97a680d041f3c49e6f2f177d | |
| parent | 9810153aebeb7dfd9b65774dd8775e382736bbf1 (diff) | |
| parent | c8ba7501b78ec3fe7595d7f783a2ee91ff684b14 (diff) | |
| download | pleroma-1e83727fdd61de05d734e8395996cb695c4b1e15.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
| -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..0c73f892a 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 parameters." + ) +end |