diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-15 21:54:24 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-15 21:54:24 +0000 |
| commit | bb49d8f5a0dbbad65a8f65a28cc2d0847b518067 (patch) | |
| tree | 938fb7fd74053a816c21948b28d5f6cfb7443f37 /config/test.exs | |
| parent | e8493431bfc16977e43715bf8bdb09ac46580028 (diff) | |
| parent | 8d15d6c3ab9aecb82ba5126bb5efef20b3dfef41 (diff) | |
| download | pleroma-2.0.1.tar.gz | |
Merge branch 'release/2.0.1' into 'stable'v2.0.1
2.0.1 release
See merge request pleroma/pleroma!2298
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 a17886265..b8ea63c94 100644 --- a/config/test.exs +++ b/config/test.exs @@ -92,6 +92,8 @@ config :pleroma, :modules, runtime_dir: "test/fixtures/modules" 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 |