about summary refs log tree commit diff
path: root/app/javascript/flavours
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-02-17 11:58:17 +0100
committerThibaut Girka <thib@sitedethib.com>2019-02-17 12:26:55 +0100
commit369a475a7001677493b452b9aaea1141de442c53 (patch)
treea0c81f0876c68827cfa0e856844054e53cb2e741 /app/javascript/flavours
parentab9082b3325dfd193d7130d6c880e85ab2781bc0 (diff)
parent147b4c2c3afacd6ad9d5c1353c072861eaca5fd2 (diff)
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.
Diffstat (limited to 'app/javascript/flavours')
-rw-r--r--app/javascript/flavours/vanilla/theme.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/vanilla/theme.yml b/app/javascript/flavours/vanilla/theme.yml
index bd9fb1dab..a215b2625 100644
--- a/app/javascript/flavours/vanilla/theme.yml
+++ b/app/javascript/flavours/vanilla/theme.yml
@@ -7,7 +7,7 @@ pack:
     filename: common.js
     stylesheet: true
   embed: public.js
-  error:
+  error: error.js
   home:
     filename: application.js
     preload: