diff options
author | lain <lain@soykaf.club> | 2020-10-01 11:15:13 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-10-01 11:15:13 +0000 |
commit | 241f7cb1ed91a8d6855dbd03517e85c98c08edb7 (patch) | |
tree | 5b60cabc2c4c41ed8c956aa2202cf0ee71706caa /config/test.exs | |
parent | 34029ffb90175e9beb43bc20b76a8093971d8ca6 (diff) | |
parent | cbdaabad345914e7424e614032056ff86e21142f (diff) | |
download | pleroma-241f7cb1ed91a8d6855dbd03517e85c98c08edb7.tar.gz pleroma-241f7cb1ed91a8d6855dbd03517e85c98c08edb7.zip |
Merge branch 'web-push-fix' into 'develop'
web push http_client fix
Closes #2202
See merge request pleroma/pleroma!3052
Diffstat (limited to 'config/test.exs')
-rw-r--r-- | config/test.exs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/test.exs b/config/test.exs index 93a0e2a61..95f860f2f 100644 --- a/config/test.exs +++ b/config/test.exs @@ -83,8 +83,6 @@ config :web_push_encryption, :vapid_details, "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4", private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA" -config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock - config :pleroma, Oban, queues: false, crontab: false, |