diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2019-08-25 21:00:58 +0000 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2019-08-25 21:00:58 +0000 |
| commit | 361940e119321900deca49e7b1d547b779813490 (patch) | |
| tree | 10a82fafa65d9d4d6dcf4336ebbfeccdd8dae93a /config/test.exs | |
| parent | 6dc24422dc403663f6385272f071e2223c24b2ce (diff) | |
| parent | c19d4eeaeebec3d938324fe24b67182fc5d2be4e (diff) | |
| download | pleroma-integration/alex.s/gun.tar.gz | |
Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into integration/alex.s/gunintegration/alex.s/gun
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index 567780987..f35815e7f 100644 --- a/config/test.exs +++ b/config/test.exs @@ -86,6 +86,8 @@ config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp3 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock +config :pleroma, Pleroma.Gun.API, Pleroma.Gun.API.Mock + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |