Merge remote-tracking branch 'origin/develop' into oban/backup
This commit is contained in:
commit
775f45cfe2
12 changed files with 64 additions and 28 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue