commit: f32a837afa694999426d644d00ddbe0c521d0bb3
parent ff663c0aeb765351017f34bbeda2f336b6d09e26
Author: feld <feld@feld.me>
Date: Tue, 23 Jul 2024 14:51:45 +0000
Merge branch 'dialyzer' into 'develop'
Fix dialyzer error
See merge request pleroma/pleroma!4190
Diffstat:
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/changelog.d/dialyzer5.skip b/changelog.d/dialyzer5.skip
diff --git a/config/test.exs b/config/test.exs
@@ -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
+
if File.exists?("./config/test.secret.exs") do
import_config "test.secret.exs"
else
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
@@ -14,7 +14,6 @@ defmodule Pleroma.Application do
@name Mix.Project.config()[:name]
@version Mix.Project.config()[:version]
@repository Mix.Project.config()[:source_url]
- @compile_env Mix.env()
def name, do: @name
def version, do: @version
@@ -53,7 +52,7 @@ defmodule Pleroma.Application do
Pleroma.Config.Oban.warn()
Config.DeprecationWarnings.warn()
- if @compile_env != :test do
+ if Config.get([Pleroma.Web.Plugs.HTTPSecurityPlug, :enable], true) do
Pleroma.Web.Plugs.HTTPSecurityPlug.warn_if_disabled()
end