Merge branch 'gs-master' into glitch-theme

diff --cc app/controllers/admin/base_controller.rb
index 726134509007106438e9b3547639856ef72a3786,7fb69d5789ec855b487d08284f2a2e6122d98371..fc299f74c5f0f8532157139bbaaa20100ef80b8b
--- 1/app/controllers/admin/base_controller.rb
--- 2/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@@ -3,14 -3,10 +3,15 @@@
  module Admin
    class BaseController < ApplicationController
      include Authorization
+     include AccountableConcern
  
 +    layout 'admin'
 +
      before_action :require_staff!
 +    before_action :set_pack
  
 -    layout 'admin'
 +    def set_pack
 +      use_pack 'admin'
 +    end
    end
  end

diff --cc app/controllers/auth/registrations_controller.rb
Simple merge

diff --cc app/javascript/flavours/glitch/components/status.js
index 6662285d0ac2bd306c344f0886ecf213c5a508e6,9288bcafa4a9daf194c20ce2f08a7c7d190d766a..b0d9e375769f3ccd81d16090d8659632e620f780
--- 1/app/javascript/flavours/glitch/components/status.js
--- 2/app/javascript/themes/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@@ -6,9 -6,10 +6,10 @@@ import StatusHeader from './status_head
  import StatusContent from './status_content';
  import StatusActionBar from './status_action_bar';
  import ImmutablePureComponent from 'react-immutable-pure-component';
 -import { MediaGallery, Video } from 'themes/glitch/util/async-components';
 +import { MediaGallery, Video } from 'flavours/glitch/util/async-components';
  import { HotKeys } from 'react-hotkeys';
 -import NotificationOverlayContainer from 'themes/glitch/features/notifications/containers/overlay_container';
 +import NotificationOverlayContainer from 'flavours/glitch/features/notifications/containers/overlay_container';
+ import classNames from 'classnames';
  
  // We use the component (and not the container) since we do not want
  // to use the progress bar to show download progress

diff --cc app/javascript/flavours/glitch/containers/status_container.js
Simple merge

diff --cc app/javascript/flavours/glitch/features/notifications/components/follow.js
Simple merge

diff --cc app/javascript/flavours/glitch/features/notifications/components/notification.js
Simple merge

diff --cc app/javascript/flavours/glitch/features/notifications/containers/notification_container.js
Simple merge

diff --cc app/javascript/flavours/glitch/features/status/components/detailed_status.js
Simple merge

diff --cc app/javascript/flavours/glitch/features/status/index.js
Simple merge

diff --cc app/javascript/flavours/glitch/features/ui/index.js
Simple merge

diff --cc app/javascript/flavours/glitch/styles/_mixins.scss
Simple merge

diff --cc app/javascript/flavours/glitch/styles/components.scss
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc app/models/user.rb
index 2458cf298e8fd8498a4d2192e87ce055cd314d7e,578622fdf85fb8ca76ce7e5c01e65003608b86e7..29bdcbd671304681e65d3c19eb8ac479c23e819f
--- 1/app/models/user.rb
--- 2/app/models/user.rb
+++ b/app/models/user.rb
@@@ -74,9 -76,11 +76,11 @@@ class User < ApplicationRecor
    has_many :session_activations, dependent: :destroy
  
    delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
 -           :reduce_motion, :system_font_ui, :noindex, :theme,
 +           :reduce_motion, :system_font_ui, :noindex, :flavour, :skin,
             to: :settings, prefix: :setting, allow_nil: false
  
+   attr_accessor :invite_code
+ 
    def confirmed?
      confirmed_at.present?
    end

diff --cc config/locales/simple_form.en.yml
Simple merge

diff --cc config/settings.yml
Simple merge