36c8570e50
Fix HAML linting issue
2023-10-25 20:01:51 +02:00
62620956d5
Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream
2023-10-25 19:59:17 +02:00
70dbf84b9b
Solve simplest haml-lint `Rubocop` lints ( #27529 )
2023-10-25 12:38:01 +00:00
34efd1a24c
Switch to using a `common` runtime chunk rather than `locales`
2023-06-10 17:43:13 +02:00
412218af2e
Merge branch 'master' into glitch-soc/merge-upstream
2020-11-07 18:23:02 +01:00
9b1f2a4b61
Add subresource integrity for JS and CSS assets ( #15096 )
...
Fix #2744
2020-11-06 11:56:31 +01:00
cac75e01b8
Fix static error page to use the correct pack
2019-02-17 13:34:40 +01:00
369a475a70
Merge branch 'master' into glitch-soc/merge-upstream
...
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-17 12:26:55 +01:00
80388a3ffe
Change error graphic to hover-to-play ( #10055 )
...
Fix #6060
2019-02-15 23:33:25 +01:00
e8d5affe06
Restore oops.gif animation for user who have auto_play_gif set
2018-12-19 20:49:58 +01:00
0c2d48b60a
Replace animated oops.gif by a non-animated image
...
Fixes #6060
2018-12-19 20:49:58 +01:00
e8a9627f66
Hardcode default skin/theme in error layout ( fixes #373 )
...
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.
2018-05-31 14:38:48 +02:00
bdbbd06dad
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
8d6b9ba494
Merge upstream 2.0ish #165
2017-10-11 10:43:10 -07:00
6e9e0c14e6
Fix dependency of error page generation on database ( #5280 )
2017-10-09 10:05:10 +02:00
5b45c1646a
Remove dependency on db during assets:precompile ( #5138 )
2017-09-29 03:03:03 +02:00
cf1f83ca2a
Fixed lingering upstream Theme code
2017-09-28 17:45:16 -07:00
3b60832214
New error page graphic. Other error page improvements ( #5099 )
...
- 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-25 23:05:54 +02:00
2c8e3fbbfb
Generate 500.html with assets:precompile, remove loading from Google Fonts ( #5067 )
2017-09-25 04:04:04 +02:00
48594b18e6
Added haml-lint and fix warnings ( #2773 )
...
* add haml_lint to Gemfile
* add .haml-lint.yml
* fix warnings of haml_lint
2017-05-08 03:35:25 +02:00
598d3defd5
Use default locale for html lang in layouts ( #2212 )
2017-04-20 13:09:31 +02:00
e22a56183a
Improve error page layouting. 500 page has to stay static because it's
...
used from nginx when Rails fails.
2017-01-21 22:30:47 +01:00
Claire