diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-11-12 17:42:53 -0600 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-11-14 17:39:08 -0600 |
| commit | f60e0b62f4e5300645f235983e5b75bcf16b370d (patch) | |
| tree | 0c437e6600b7a8bdf806d63fa76ce751bbe66d58 /app/views/layouts/error.html.haml | |
| parent | ec3abd7c87116ad2df5b1da5701afe68a7f74844 (diff) | |
| parent | 265b26489a9214a6c98a4dfa88f08ce490211ebc (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
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 |