diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-07 21:47:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-07 21:47:31 +0100 |
| commit | cfb16b9b70a50ec5451c9aebb2c35d3a44701311 (patch) | |
| tree | 6ba298899b376d0c8862d77c1e34339a08dc3121 /app/views/layouts/error.html.haml | |
| parent | 5a9fc749c3eab8d3c93dd282fa89c20a5cb0e994 (diff) | |
| parent | e4d62042bdb3b0d675c2367b4c48a2a48647af5e (diff) | |
Merge pull request #1453 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/layouts/error.html.haml')
| -rw-r--r-- | app/views/layouts/error.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml index f8315afb5..55da5de3f 100644 --- a/app/views/layouts/error.html.haml +++ b/app/views/layouts/error.html.haml @@ -5,7 +5,7 @@ %meta{ charset: 'utf-8' }/ %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ') %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/ - = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous' + = javascript_pack_tag "locales", crossorigin: 'anonymous' = render partial: 'layouts/theme', object: (@core || { pack: 'common' }) = render partial: 'layouts/theme', object: (@theme || { pack: 'error', flavour: 'glitch', common: { pack: 'common', flavour: 'glitch', skin: 'default' } }) %body.error |