logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 1e83727fdd61de05d734e8395996cb695c4b1e15
parent: 9810153aebeb7dfd9b65774dd8775e382736bbf1
Author: lain <lain@soykaf.club>
Date:   Sat,  5 May 2018 13:41:27 +0200

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

Diffstat:

Mconfig/test.exs9+++++++++
1 file changed, 9 insertions(+), 0 deletions(-)

diff --git 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