diff options
| author | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
| commit | 76722ea9c8dfbb8fefe247883946aa5c872d9a49 (patch) | |
| tree | 34020541df1d6684e935cfd09f36cb6eed7b13f6 /config | |
| parent | a3d1d4894fdd8dd0133e1d2c6fde9d95f49dfcc7 (diff) | |
| parent | bb864e96ad4e0be470da78baa000019f571e30db (diff) | |
| download | pleroma-76722ea9c8dfbb8fefe247883946aa5c872d9a49.tar.gz pleroma-76722ea9c8dfbb8fefe247883946aa5c872d9a49.zip | |
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
Diffstat (limited to 'config')
| -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 |