Autofix Rubocop spacing in config (#25022)
This commit is contained in:
		
							parent
							
								
									19f9098551
								
							
						
					
					
						commit
						c0b9664a31
					
				
					 5 changed files with 7 additions and 40 deletions
				
			
		| 
						 | 
					@ -21,12 +21,6 @@ Layout/ArgumentAlignment:
 | 
				
			||||||
    - 'config/initializers/cors.rb'
 | 
					    - 'config/initializers/cors.rb'
 | 
				
			||||||
    - 'config/initializers/session_store.rb'
 | 
					    - 'config/initializers/session_store.rb'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# This cop supports safe autocorrection (--autocorrect).
 | 
					 | 
				
			||||||
# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
 | 
					 | 
				
			||||||
Layout/ExtraSpacing:
 | 
					 | 
				
			||||||
  Exclude:
 | 
					 | 
				
			||||||
    - 'config/initializers/omniauth.rb'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# This cop supports safe autocorrection (--autocorrect).
 | 
					# This cop supports safe autocorrection (--autocorrect).
 | 
				
			||||||
# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 | 
					# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 | 
				
			||||||
# SupportedHashRocketStyles: key, separator, table
 | 
					# SupportedHashRocketStyles: key, separator, table
 | 
				
			||||||
| 
						 | 
					@ -39,12 +33,6 @@ Layout/HashAlignment:
 | 
				
			||||||
    - 'config/initializers/rack_attack.rb'
 | 
					    - 'config/initializers/rack_attack.rb'
 | 
				
			||||||
    - 'config/routes.rb'
 | 
					    - 'config/routes.rb'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# This cop supports safe autocorrection (--autocorrect).
 | 
					 | 
				
			||||||
# Configuration parameters: Width, AllowedPatterns.
 | 
					 | 
				
			||||||
Layout/IndentationWidth:
 | 
					 | 
				
			||||||
  Exclude:
 | 
					 | 
				
			||||||
    - 'config/initializers/ffmpeg.rb'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# This cop supports safe autocorrection (--autocorrect).
 | 
					# This cop supports safe autocorrection (--autocorrect).
 | 
				
			||||||
# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
 | 
					# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
 | 
				
			||||||
Layout/LeadingCommentSpace:
 | 
					Layout/LeadingCommentSpace:
 | 
				
			||||||
| 
						 | 
					@ -52,14 +40,6 @@ Layout/LeadingCommentSpace:
 | 
				
			||||||
    - 'config/application.rb'
 | 
					    - 'config/application.rb'
 | 
				
			||||||
    - 'config/initializers/omniauth.rb'
 | 
					    - 'config/initializers/omniauth.rb'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# This cop supports safe autocorrection (--autocorrect).
 | 
					 | 
				
			||||||
# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 | 
					 | 
				
			||||||
# SupportedStyles: space, no_space
 | 
					 | 
				
			||||||
# SupportedStylesForEmptyBraces: space, no_space
 | 
					 | 
				
			||||||
Layout/SpaceBeforeBlockBraces:
 | 
					 | 
				
			||||||
  Exclude:
 | 
					 | 
				
			||||||
    - 'config/initializers/paperclip.rb'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# This cop supports safe autocorrection (--autocorrect).
 | 
					# This cop supports safe autocorrection (--autocorrect).
 | 
				
			||||||
# Configuration parameters: EnforcedStyle.
 | 
					# Configuration parameters: EnforcedStyle.
 | 
				
			||||||
# SupportedStyles: require_no_space, require_space
 | 
					# SupportedStyles: require_no_space, require_space
 | 
				
			||||||
| 
						 | 
					@ -68,19 +48,6 @@ Layout/SpaceInLambdaLiteral:
 | 
				
			||||||
    - 'config/environments/production.rb'
 | 
					    - 'config/environments/production.rb'
 | 
				
			||||||
    - 'config/initializers/content_security_policy.rb'
 | 
					    - 'config/initializers/content_security_policy.rb'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# This cop supports safe autocorrection (--autocorrect).
 | 
					 | 
				
			||||||
# Configuration parameters: EnforcedStyle.
 | 
					 | 
				
			||||||
# SupportedStyles: space, no_space
 | 
					 | 
				
			||||||
Layout/SpaceInsideStringInterpolation:
 | 
					 | 
				
			||||||
  Exclude:
 | 
					 | 
				
			||||||
    - 'config/initializers/webauthn.rb'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# This cop supports safe autocorrection (--autocorrect).
 | 
					 | 
				
			||||||
# Configuration parameters: AllowInHeredoc.
 | 
					 | 
				
			||||||
Layout/TrailingWhitespace:
 | 
					 | 
				
			||||||
  Exclude:
 | 
					 | 
				
			||||||
    - 'config/initializers/paperclip.rb'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Configuration parameters: AllowedMethods, AllowedPatterns.
 | 
					# Configuration parameters: AllowedMethods, AllowedPatterns.
 | 
				
			||||||
Lint/AmbiguousBlockAssociation:
 | 
					Lint/AmbiguousBlockAssociation:
 | 
				
			||||||
  Exclude:
 | 
					  Exclude:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,3 +1,3 @@
 | 
				
			||||||
if ENV['FFMPEG_BINARY'].present?
 | 
					if ENV['FFMPEG_BINARY'].present?
 | 
				
			||||||
    FFMPEG.ffmpeg_binary = ENV['FFMPEG_BINARY']
 | 
					  FFMPEG.ffmpeg_binary = ENV['FFMPEG_BINARY']
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -73,7 +73,7 @@ Devise.setup do |config|
 | 
				
			||||||
    oidc_options[:display_name] = ENV['OIDC_DISPLAY_NAME'] #OPTIONAL
 | 
					    oidc_options[:display_name] = ENV['OIDC_DISPLAY_NAME'] #OPTIONAL
 | 
				
			||||||
    oidc_options[:issuer] = ENV['OIDC_ISSUER'] if ENV['OIDC_ISSUER'] #NEED
 | 
					    oidc_options[:issuer] = ENV['OIDC_ISSUER'] if ENV['OIDC_ISSUER'] #NEED
 | 
				
			||||||
    oidc_options[:discovery] = ENV['OIDC_DISCOVERY'] == 'true' if ENV['OIDC_DISCOVERY'] #OPTIONAL (default: false)
 | 
					    oidc_options[:discovery] = ENV['OIDC_DISCOVERY'] == 'true' if ENV['OIDC_DISCOVERY'] #OPTIONAL (default: false)
 | 
				
			||||||
    oidc_options[:client_auth_method] =  ENV['OIDC_CLIENT_AUTH_METHOD'] if ENV['OIDC_CLIENT_AUTH_METHOD'] #OPTIONAL (default: basic)
 | 
					    oidc_options[:client_auth_method] = ENV['OIDC_CLIENT_AUTH_METHOD'] if ENV['OIDC_CLIENT_AUTH_METHOD'] #OPTIONAL (default: basic)
 | 
				
			||||||
    scope_string = ENV['OIDC_SCOPE'] if ENV['OIDC_SCOPE'] #NEED
 | 
					    scope_string = ENV['OIDC_SCOPE'] if ENV['OIDC_SCOPE'] #NEED
 | 
				
			||||||
    scopes = scope_string.split(',')
 | 
					    scopes = scope_string.split(',')
 | 
				
			||||||
    oidc_options[:scope] = scopes.map { |x| x.to_sym }
 | 
					    oidc_options[:scope] = scopes.map { |x| x.to_sym }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -61,13 +61,13 @@ if ENV['S3_ENABLED'] == 'true'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    s3_options: {
 | 
					    s3_options: {
 | 
				
			||||||
      signature_version: ENV.fetch('S3_SIGNATURE_VERSION') { 'v4' },
 | 
					      signature_version: ENV.fetch('S3_SIGNATURE_VERSION') { 'v4' },
 | 
				
			||||||
      http_open_timeout: ENV.fetch('S3_OPEN_TIMEOUT'){ '5' }.to_i,
 | 
					      http_open_timeout: ENV.fetch('S3_OPEN_TIMEOUT') { '5' }.to_i,
 | 
				
			||||||
      http_read_timeout: ENV.fetch('S3_READ_TIMEOUT'){ '5' }.to_i,
 | 
					      http_read_timeout: ENV.fetch('S3_READ_TIMEOUT') { '5' }.to_i,
 | 
				
			||||||
      http_idle_timeout: 5,
 | 
					      http_idle_timeout: 5,
 | 
				
			||||||
      retry_limit: 0,
 | 
					      retry_limit: 0,
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  )
 | 
					  )
 | 
				
			||||||
  
 | 
					
 | 
				
			||||||
  Paperclip::Attachment.default_options[:s3_permissions] = ->(*) { nil } if ENV['S3_PERMISSION'] == ''
 | 
					  Paperclip::Attachment.default_options[:s3_permissions] = ->(*) { nil } if ENV['S3_PERMISSION'] == ''
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if ENV.has_key?('S3_ENDPOINT')
 | 
					  if ENV.has_key?('S3_ENDPOINT')
 | 
				
			||||||
| 
						 | 
					@ -124,7 +124,7 @@ elsif ENV['SWIFT_ENABLED'] == 'true'
 | 
				
			||||||
      openstack_cache_ttl: ENV.fetch('SWIFT_CACHE_TTL') { 60 },
 | 
					      openstack_cache_ttl: ENV.fetch('SWIFT_CACHE_TTL') { 60 },
 | 
				
			||||||
      openstack_temp_url_key: ENV['SWIFT_TEMP_URL_KEY'],
 | 
					      openstack_temp_url_key: ENV['SWIFT_TEMP_URL_KEY'],
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    
 | 
					
 | 
				
			||||||
    fog_file: { 'Cache-Control' => 'public, max-age=315576000, immutable' },
 | 
					    fog_file: { 'Cache-Control' => 'public, max-age=315576000, immutable' },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    fog_directory: ENV['SWIFT_CONTAINER'],
 | 
					    fog_directory: ENV['SWIFT_CONTAINER'],
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
WebAuthn.configure do |config|
 | 
					WebAuthn.configure do |config|
 | 
				
			||||||
  # This value needs to match `window.location.origin` evaluated by
 | 
					  # This value needs to match `window.location.origin` evaluated by
 | 
				
			||||||
  # the User Agent during registration and authentication ceremonies.
 | 
					  # the User Agent during registration and authentication ceremonies.
 | 
				
			||||||
  config.origin = "#{Rails.configuration.x.use_https ? 'https' : 'http' }://#{Rails.configuration.x.web_domain}"
 | 
					  config.origin = "#{Rails.configuration.x.use_https ? 'https' : 'http'}://#{Rails.configuration.x.web_domain}"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Relying Party name for display purposes
 | 
					  # Relying Party name for display purposes
 | 
				
			||||||
  config.rp_name = "Mastodon"
 | 
					  config.rp_name = "Mastodon"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue