Conflicts: - `app/controllers/admin/base_controller.rb`: Minor conflict caused by glitch-soc's theming system. - `app/javascript/mastodon/initial_state.js`: Minor conflict caused by glitch-soc making use of max_toot_chars. - `app/models/form/admin_settings.rb`: Minor conflict caused by glitch-soc's theming system. - `app/models/trends.rb`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `app/views/admin/accounts/index.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/admin/instances/show.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/layouts/application.html.haml`: Minor conflict caused by glitch-soc's theming system. - `app/views/settings/preferences/notifications/show.html.haml`: Minor conflict caused by glitch-soc having more granular notification settings for trends. - `config/navigation.rb`: Minor conflict caused by glitch-soc having additional navigation items for the theming system while upstream slightly changed every line.
		
			
				
	
	
		
			28 lines
		
	
	
	
		
			523 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			28 lines
		
	
	
	
		
			523 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
module Admin
 | 
						|
  class BaseController < ApplicationController
 | 
						|
    include Authorization
 | 
						|
    include AccountableConcern
 | 
						|
 | 
						|
    layout 'admin'
 | 
						|
 | 
						|
    before_action :set_pack
 | 
						|
    before_action :set_body_classes
 | 
						|
    after_action :verify_authorized
 | 
						|
 | 
						|
    private
 | 
						|
 | 
						|
    def set_body_classes
 | 
						|
      @body_classes = 'admin'
 | 
						|
    end
 | 
						|
 | 
						|
    def set_pack
 | 
						|
      use_pack 'admin'
 | 
						|
    end
 | 
						|
 | 
						|
    def set_user
 | 
						|
      @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
 | 
						|
    end
 | 
						|
  end
 | 
						|
end
 |