diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-05-05 09:58:17 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-05-05 09:58:17 +0000 |
| commit | c8ba7501b78ec3fe7595d7f783a2ee91ff684b14 (patch) | |
| tree | a83a9551c9c8cb38df7f0d01a240cba88d9c1797 | |
| parent | c464355d1ac7f9558aa50f7038035b9a47614822 (diff) | |
| parent | 737c42920ad81b08c5dc06944f570084da179380 (diff) | |
| download | pleroma-c8ba7501b78ec3fe7595d7f783a2ee91ff684b14.tar.gz | |
Merge branch 'feld-test.secret' into 'develop'
Make it possible to use custom database connection parameters
See merge request pleroma/pleroma!143
| -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 |