Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.
This commit is contained in:
		@@ -42,6 +42,7 @@ class Form::AdminSettings
 | 
			
		||||
    show_domain_blocks_rationale
 | 
			
		||||
    noindex
 | 
			
		||||
    outgoing_spoilers
 | 
			
		||||
    require_invite_text
 | 
			
		||||
  ).freeze
 | 
			
		||||
 | 
			
		||||
  BOOLEAN_KEYS = %i(
 | 
			
		||||
@@ -62,6 +63,7 @@ class Form::AdminSettings
 | 
			
		||||
    trends
 | 
			
		||||
    trendable_by_default
 | 
			
		||||
    noindex
 | 
			
		||||
    require_invite_text
 | 
			
		||||
  ).freeze
 | 
			
		||||
 | 
			
		||||
  UPLOAD_KEYS = %i(
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user