sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'tusooa/lint' into 'develop' 

Make lint happy

See merge request pleroma/pleroma!3944
This commit is contained in:
Haelwenn 2023-08-31 22:24:30 +00:00
parent 1e685c8302 3c5ecca377
commit 9da4f89b7b
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
changelog.d/lint.skip Normal file
View File

2
lib/pleroma/web/plugs/http_security_plug.ex
View File

@ -100,6 +100,7 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlug do
if Config.get([:media_proxy, :enabled]) && if Config.get([:media_proxy, :enabled]) &&
!Config.get([:media_proxy, :proxy_opts, :redirect_on_failure]) do !Config.get([:media_proxy, :proxy_opts, :redirect_on_failure]) do
sources = build_csp_multimedia_source_list() sources = build_csp_multimedia_source_list()
{ {
[img_src, sources], [img_src, sources],
[media_src, sources], [media_src, sources],
@ -113,7 +114,6 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlug do
} }
end end
connect_src = connect_src =
if Config.get(:env) == :dev do if Config.get(:env) == :dev do
[connect_src, " http://localhost:3035/"] [connect_src, " http://localhost:3035/"]