diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-31 20:38:58 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2021-01-31 20:38:58 +0300 |
| commit | 1b49b8efe57256b3f64b4b7e8a1de805ab030814 (patch) | |
| tree | 2250cc1eb3d17b79c292b4ff4130172a6dea6c31 /config/config.exs | |
| parent | 6fd4163ab60be07b1a20ac8911e105ddca8e2095 (diff) | |
| parent | 7ac0a819811496fe512544e91b6f0ff3d15b8856 (diff) | |
| download | pleroma-1b49b8efe57256b3f64b4b7e8a1de805ab030814.tar.gz pleroma-1b49b8efe57256b3f64b4b7e8a1de805ab030814.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index dfd2fc434..36c609936 100644 --- a/config/config.exs +++ b/config/config.exs @@ -438,7 +438,9 @@ config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Http, headers: [], options: [] -config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Script, script_path: nil +config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Script, + script_path: nil, + url_format: nil # Note: media preview proxy depends on media proxy to be enabled config :pleroma, :media_preview_proxy, @@ -725,7 +727,10 @@ config :pleroma, :frontends, "git" => "https://git.pleroma.social/pleroma/fedi-fe", "build_url" => "https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build", - "ref" => "master" + "ref" => "master", + "custom-http-headers" => [ + {"service-worker-allowed", "/"} + ] }, "admin-fe" => %{ "name" => "admin-fe", |