diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-07 15:34:00 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-07 15:58:45 +0200 |
| commit | e9ad99bc93b6f65277956d997792ec40f08165cb (patch) | |
| tree | ce71714d2d0d680adecf070cb4e698f3a6984b56 /app/views/layouts | |
| parent | 94e09d309cb068ea92919767e40e655260ac43cb (diff) | |
| parent | 6e25574ce599cbc37b7215ded03c7d07208af6bb (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `package.json`: Not really a conflict, just some glitch-soc-specific dependency too close to an upstream-updated one.
Diffstat (limited to 'app/views/layouts')
| -rwxr-xr-x | app/views/layouts/application.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 92edaea3c..3336cf391 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -27,6 +27,7 @@ - elsif @theme[:supported_locales].include? 'en' = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous' = csrf_meta_tags + %meta{ name: 'style-nonce', content: request.content_security_policy_nonce } = stylesheet_link_tag '/inert.css', skip_pipeline: true, media: 'all', id: 'inert-style' |