From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 17 Feb 2019 10:58:17 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=369a475a7001677493b452b9aaea1141de442c53;p=mastodon.git

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.
---

369a475a7001677493b452b9aaea1141de442c53
diff --cc app/javascript/flavours/vanilla/theme.yml
index bd9fb1dab,000000000..a215b2625
mode 100644,000000..100644
--- a/app/javascript/flavours/vanilla/theme.yml
+++ b/app/javascript/flavours/vanilla/theme.yml
@@@ -1,44 -1,0 +1,44 @@@
 +#  (REQUIRED) The location of the pack files inside `pack_directory`.
 +pack:
 +  about: about.js
 +  admin: public.js
 +  auth:
 +  common:
 +    filename: common.js
 +    stylesheet: true
 +  embed: public.js
-   error:
++  error: error.js
 +  home:
 +    filename: application.js
 +    preload:
 +    - features/getting_started
 +    - features/compose
 +    - features/home_timeline
 +    - features/notifications
 +  mailer:
 +  modal:
 +  public: public.js
 +  settings: public.js
 +  share: share.js
 +
 +#  (OPTIONAL) The directory which contains localization files for
 +#  the flavour, relative to this directory.
 +locales: ../../mastodon/locales
 +
 +#  (OPTIONAL) A file to use as the preview screenshot for the flavour,
 +#  or an array thereof. These filenames must be unique across all
 +#  images (regardless of path), so it's a good idea to namespace them
 +#  to your theme. It's up to you to let webpack know to compile them.
 +screenshot: screenshot.jpg
 +
 +#  (OPTIONAL) The directory which contains the pack files.
 +#  Defaults to this directory (`app/javascript/flavour/[flavour]`),
 +#  but in the case of the vanilla Mastodon flavour the pack files are
 +#  somewhere else.
 +pack_directory: app/javascript/packs
 +
 +#  (OPTIONAL) By default the theme will fallback to the default flavour
 +#  if a particular pack is not provided. You can specify different
 +#  fallbacks here, or disable fallback behaviours altogether by
 +#  specifying a `null` value.
 +fallback:
diff --cc app/serializers/rest/instance_serializer.rb
index cab05e60a,216808ffb..41ed1995d
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@@ -4,8 -4,8 +4,8 @@@ class REST::InstanceSerializer < Active
    include RoutingHelper
  
    attributes :uri, :title, :description, :email,
 -             :version, :urls, :stats, :thumbnail,
 +             :version, :urls, :stats, :thumbnail, :max_toot_chars,
-              :languages
+              :languages, :registrations
  
    has_one :contact_account, serializer: REST::AccountSerializer
  
diff --cc app/views/layouts/error.html.haml
index d662d85e2,25c85abf9..e9c474082
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@@ -5,10 -5,13 +5,12 @@@
      %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' }/
 -    = stylesheet_pack_tag 'common', media: 'all'
 -    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
 -    = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
 -    = javascript_pack_tag 'error', integrity: true, crossorigin: 'anonymous'
++    = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
 +    = 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: current_user&.setting_auto_play_gif ? '/oops.gif' : '/oops.png' }/
-       %div
+       .dialog__illustration
+         %img{ alt: Setting.default_settings['site_title'], src: '/oops.png' }/
+       .dialog__message
          %h1= yield :content