Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.
		
			
				
	
	
		
			29 lines
		
	
	
		
			521 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			29 lines
		
	
	
		
			521 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
module Admin
 | 
						|
  class BaseController < ApplicationController
 | 
						|
    include Authorization
 | 
						|
    include AccountableConcern
 | 
						|
 | 
						|
    layout 'admin'
 | 
						|
 | 
						|
    before_action :require_staff!
 | 
						|
    before_action :set_pack
 | 
						|
    before_action :set_body_classes
 | 
						|
 | 
						|
    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
 |