about summary refs log tree commit diff
path: root/app/views/layouts/error.html.haml
AgeCommit message (Collapse)Author
2020-11-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-11-06Add subresource integrity for JS and CSS assets (#15096)Eugen Rochko
Fix #2744
2019-02-17Fix static error page to use the correct packThibaut Girka
2019-02-17Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.
2019-02-15Change error graphic to hover-to-play (#10055)Eugen Rochko
Fix #6060
2018-12-19Restore oops.gif animation for user who have auto_play_gif setThibaut Girka
2018-12-19Replace animated oops.gif by a non-animated imageThibaut Girka
Fixes #6060
2018-05-31Hardcode default skin/theme in error layout (fixes #373)Thibaut Girka
This is a bit hackish. The best way would simply to somehow use Mastodon's ApplicationController with `use_pack 'error'` from the Rake task, but I'm not sure how to do that.
2017-11-20Finalized theme loading and stuffkibigo!
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-09Fix dependency of error page generation on database (#5280)Eugen Rochko
2017-09-29Remove dependency on db during assets:precompile (#5138)Eugen Rochko
2017-09-28Fixed lingering upstream Theme codekibigo!
2017-09-25New error page graphic. Other error page improvements (#5099)Eugen Rochko
- 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault
2017-09-25Generate 500.html with assets:precompile, remove loading from Google Fonts ↵Eugen Rochko
(#5067)
2017-05-08Added haml-lint and fix warnings (#2773)yhirano
* add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint
2017-04-20Use default locale for html lang in layouts (#2212)Matt Jankowski
2017-01-21Improve error page layouting. 500 page has to stay static because it'sEugen Rochko
used from nginx when Rails fails.