diff options
author | Mark Felder <feld@feld.me> | 2024-07-25 14:43:40 -0400 |
---|---|---|
committer | Mark Felder <feld@feld.me> | 2024-07-25 14:43:40 -0400 |
commit | 775f45cfe254595561dff8b8dd10d6570d412612 (patch) | |
tree | 557e6be7e37bafca8fb3170beecdc9aad0b214fd /config/test.exs | |
parent | 187897874bddc27ef23606730e79522e3583ec43 (diff) | |
parent | 700c1066801ba1400a32c819fb0e608aa834aa51 (diff) | |
download | pleroma-775f45cfe254595561dff8b8dd10d6570d412612.tar.gz pleroma-775f45cfe254595561dff8b8dd10d6570d412612.zip |
Merge remote-tracking branch 'origin/develop' into oban/backup
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 2a007a22d..723bbc8e6 100644 --- a/config/test.exs +++ b/config/test.exs @@ -187,6 +187,8 @@ config :pleroma, Pleroma.Emoji.Loader, test_emoji: true config :pleroma, Pleroma.Web.RichMedia.Backfill, stream_out: Pleroma.Web.ActivityPub.ActivityPubMock +config :pleroma, Pleroma.Web.Plugs.HTTPSecurityPlug, enable: false + config :pleroma, Pleroma.User.Backup, tempdir: "test/tmp" if File.exists?("./config/test.secret.exs") do |