Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.
		
			
				
	
	
		
			58 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			58 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| # frozen_string_literal: true
 | |
| 
 | |
| class Form::AdminSettings
 | |
|   include ActiveModel::Model
 | |
| 
 | |
|   delegate(
 | |
|     :site_contact_username,
 | |
|     :site_contact_username=,
 | |
|     :site_contact_email,
 | |
|     :site_contact_email=,
 | |
|     :site_title,
 | |
|     :site_title=,
 | |
|     :site_short_description,
 | |
|     :site_short_description=,
 | |
|     :site_description,
 | |
|     :site_description=,
 | |
|     :site_extended_description,
 | |
|     :site_extended_description=,
 | |
|     :site_terms,
 | |
|     :site_terms=,
 | |
|     :open_registrations,
 | |
|     :open_registrations=,
 | |
|     :closed_registrations_message,
 | |
|     :closed_registrations_message=,
 | |
|     :open_deletion,
 | |
|     :open_deletion=,
 | |
|     :timeline_preview,
 | |
|     :timeline_preview=,
 | |
|     :show_staff_badge,
 | |
|     :show_staff_badge=,
 | |
|     :bootstrap_timeline_accounts,
 | |
|     :bootstrap_timeline_accounts=,
 | |
|     :flavour,
 | |
|     :flavour=,
 | |
|     :skin,
 | |
|     :skin=,
 | |
|     :min_invite_role,
 | |
|     :min_invite_role=,
 | |
|     :activity_api_enabled,
 | |
|     :activity_api_enabled=,
 | |
|     :peers_api_enabled,
 | |
|     :peers_api_enabled=,
 | |
|     :show_known_fediverse_at_about_page,
 | |
|     :show_known_fediverse_at_about_page=,
 | |
|     :preview_sensitive_media,
 | |
|     :preview_sensitive_media=,
 | |
|     :custom_css,
 | |
|     :custom_css=,
 | |
|     :profile_directory,
 | |
|     :profile_directory=,
 | |
|     to: Setting
 | |
|   )
 | |
| 
 | |
|   def flavour_and_skin
 | |
|     "#{Setting.flavour}/#{Setting.skin}"
 | |
|   end
 | |
| end
 |