logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 9da4f89b7b8c59947a812b95aeafd4f8efaf6a8a
parent 1e685c8302ee1935d076258833d7219321e3a0fd
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Thu, 31 Aug 2023 22:24:30 +0000

Merge branch 'tusooa/lint' into 'develop'

Make lint happy

See merge request pleroma/pleroma!3944

Diffstat:

Achangelog.d/lint.skip0
Mlib/pleroma/web/plugs/http_security_plug.ex2+-
2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/lint.skip b/changelog.d/lint.skip diff --git a/lib/pleroma/web/plugs/http_security_plug.ex b/lib/pleroma/web/plugs/http_security_plug.ex @@ -100,6 +100,7 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlug do if Config.get([:media_proxy, :enabled]) && !Config.get([:media_proxy, :proxy_opts, :redirect_on_failure]) do sources = build_csp_multimedia_source_list() + { [img_src, sources], [media_src, sources], @@ -113,7 +114,6 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlug do } end - connect_src = if Config.get(:env) == :dev do [connect_src, " http://localhost:3035/"]