mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #506 from ThibG/glitch-soc/fixes/static-500 

Hardcode default skin/theme in error layout (fixes #373)
pull/538/head
David Yip 2018-06-09 10:39:55 -05:00 committed by GitHub
parent a9515f3186 e8a9627f66
commit f9eb4ea80a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/error.html.haml
View File

@ -5,8 +5,8 @@
%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' }/
= render partial: 'layouts/theme', object: @core
= render partial: 'layouts/theme', object: @theme
= render partial: 'layouts/theme', object: (@core || { pack: 'common' })
= render partial: 'layouts/theme', object: (@theme || { pack: 'common', flavour: 'glitch', skin: 'default' })
%body.error
.dialog
%img{ alt: Setting.default_settings['site_title'], src: '/oops.gif' }/