Merge branch 'develop' into stable
This commit is contained in:
commit
fef4bae006
2 changed files with 1 additions and 3 deletions
|
@ -116,8 +116,6 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlug do
|
|||
|
||||
script_src = "script-src 'self' '#{nonce_tag}'"
|
||||
|
||||
script_src = if Mix.env() == :dev, do: [script_src, " 'unsafe-eval'"], else: script_src
|
||||
|
||||
report = if report_uri, do: ["report-uri ", report_uri, ";report-to csp-endpoint"]
|
||||
insecure = if scheme == "https", do: "upgrade-insecure-requests"
|
||||
|
||||
|
|
2
mix.exs
2
mix.exs
|
@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
|
|||
def project do
|
||||
[
|
||||
app: :pleroma,
|
||||
version: version("3.7.0"),
|
||||
version: version("3.7.1"),
|
||||
elixir: "~> 1.12",
|
||||
elixirc_paths: elixirc_paths(Mix.env()),
|
||||
compilers: [:phoenix] ++ Mix.compilers(),
|
||||
|
|
Loading…
Reference in a new issue