diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-09 21:21:09 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-09 21:21:09 +0300 |
| commit | 371d39e160efa51f2fe608e1788f6b11b89d9839 (patch) | |
| tree | b5dc6280d713f11392fd47bffd1a675b527162f5 /config/test.exs | |
| parent | d2cb18b2a342b990cc47dfdc42adb843c3db1b5e (diff) | |
| parent | 670a77ecbc94d57c6ecb5e569597e81cee4b5532 (diff) | |
| download | pleroma-371d39e160efa51f2fe608e1788f6b11b89d9839.tar.gz pleroma-371d39e160efa51f2fe608e1788f6b11b89d9839.zip | |
Merge develop
Diffstat (limited to 'config/test.exs')
| -rw-r--r-- | config/test.exs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs index 1838cffc8..1635a5d92 100644 --- a/config/test.exs +++ b/config/test.exs @@ -28,7 +28,8 @@ config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Test config :pleroma, :instance, email: "admin@example.com", notify_email: "noreply@example.com", - skip_thread_containment: false + skip_thread_containment: false, + federating: false # Configure your database config :pleroma, Pleroma.Repo, @@ -76,6 +77,8 @@ IO.puts("RUM enabled: #{rum_enabled}") config :joken, default_signer: "yU8uHKq+yyAkZ11Hx//jcdacWc8yQ1bxAAGrplzB0Zwwjkp35v0RK9SO8WTPr6QZ" +config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock + try do import_config "test.secret.exs" rescue |