diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-16 14:25:55 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-16 14:25:55 +0300 |
| commit | f0651730bdf018b713e21ce718719c7781398362 (patch) | |
| tree | 836e0fbcbb49f0ae78635a268e30013c0e94aea7 /config/test.exs | |
| parent | 98ed0d1c4bd2db354154cc4a1d1e6530eb68f499 (diff) | |
| parent | c2527b8c63a4e35b121981efe2c39cc54c77648d (diff) | |
| download | pleroma-f0651730bdf018b713e21ce718719c7781398362.tar.gz pleroma-f0651730bdf018b713e21ce718719c7781398362.zip | |
Merge branch 'develop' into 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 bce9dd4aa..040e67e4a 100644 --- a/config/test.exs +++ b/config/test.exs @@ -94,6 +94,8 @@ config :pleroma, Pleroma.Gun, Pleroma.GunMock config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: true +config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |