Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.
		
			
				
	
	
		
			44 lines
		
	
	
		
			968 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			44 lines
		
	
	
		
			968 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
class AboutController < ApplicationController
 | 
						|
  before_action :set_pack
 | 
						|
  before_action :set_body_classes
 | 
						|
  before_action :set_instance_presenter, only: [:show, :more, :terms]
 | 
						|
 | 
						|
  def show
 | 
						|
    serializable_resource = ActiveModelSerializers::SerializableResource.new(InitialStatePresenter.new(initial_state_params), serializer: InitialStateSerializer)
 | 
						|
    @initial_state_json   = serializable_resource.to_json
 | 
						|
  end
 | 
						|
 | 
						|
  def more; end
 | 
						|
 | 
						|
  def terms; end
 | 
						|
 | 
						|
  private
 | 
						|
 | 
						|
  def new_user
 | 
						|
    User.new.tap(&:build_account)
 | 
						|
  end
 | 
						|
 | 
						|
  helper_method :new_user
 | 
						|
 | 
						|
  def set_pack
 | 
						|
    use_pack action_name == 'show' ? 'about' : 'common'
 | 
						|
  end
 | 
						|
 | 
						|
  def set_instance_presenter
 | 
						|
    @instance_presenter = InstancePresenter.new
 | 
						|
  end
 | 
						|
 | 
						|
  def set_body_classes
 | 
						|
    @body_classes = 'with-modals'
 | 
						|
  end
 | 
						|
 | 
						|
  def initial_state_params
 | 
						|
    {
 | 
						|
      settings: { known_fediverse: Setting.show_known_fediverse_at_about_page },
 | 
						|
      token: current_session&.token,
 | 
						|
    }
 | 
						|
  end
 | 
						|
end
 |