From: David Yip <yipdw@member.fsf.org>
Date: Mon, 4 Dec 2017 17:07:01 +0000 (-0600)
Subject: Merge branch 'gs-master' into glitch-theme
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d9800a5647cbc57db7679094b2271f8eb5ec328b;p=mastodon.git

Merge branch 'gs-master' into glitch-theme
---

d9800a5647cbc57db7679094b2271f8eb5ec328b
diff --cc app/controllers/admin/base_controller.rb
index 726134509,7fb69d578..fc299f74c
--- a/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/javascript/flavours/glitch/components/status.js
index 6662285d0,9288bcafa..b0d9e3757
--- a/app/javascript/flavours/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/models/user.rb
index 2458cf298,578622fdf..29bdcbd67
--- a/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