diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-07-09 12:49:04 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-07-09 12:49:04 -0500 |
| commit | 9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96 (patch) | |
| tree | fc28e2fb05ad0158fe881de7a49e90d941e10ad4 /config/test.exs | |
| parent | 9f235028569968871ef9ea933459c6e9369e737a (diff) | |
| parent | e19e82975871388831fd23adc50fcaaea85ad5da (diff) | |
| download | pleroma-9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96.tar.gz pleroma-9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96.zip | |
Merge branch 'develop' into feature/allow-user-query-via-id
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 9d441a7f5..63443dde0 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, @@ -74,6 +75,8 @@ rum_enabled = System.get_env("RUM_ENABLED") == "true" config :pleroma, :database, rum_enabled: rum_enabled IO.puts("RUM enabled: #{rum_enabled}") +config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock + try do import_config "test.secret.exs" rescue |