Merge branch 'feld-test.secret' into 'develop'

Make it possible to use custom database connection parameters

See merge request pleroma/pleroma!143
This commit is contained in:
lambda 2018-05-05 09:58:17 +00:00
commit c8ba7501b7

View file

@ -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