diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-08-31 22:24:30 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-08-31 22:24:30 +0000 |
| commit | 9da4f89b7b8c59947a812b95aeafd4f8efaf6a8a (patch) | |
| tree | 10e4c4e23194ad21825e831d6e43a7b1559d536a | |
| parent | 1e685c8302ee1935d076258833d7219321e3a0fd (diff) | |
| parent | 3c5ecca37718a1eba05be1f379b8f47362079c65 (diff) | |
| download | pleroma-9da4f89b7b8c59947a812b95aeafd4f8efaf6a8a.tar.gz pleroma-9da4f89b7b8c59947a812b95aeafd4f8efaf6a8a.zip | |
Merge branch 'tusooa/lint' into 'develop'
Make lint happy
See merge request pleroma/pleroma!3944
| -rw-r--r-- | changelog.d/lint.skip | 0 | ||||
| -rw-r--r-- | lib/pleroma/web/plugs/http_security_plug.ex | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog.d/lint.skip b/changelog.d/lint.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ 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 index a3166bc96..5093414c4 100644 --- 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/"] |