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/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).
 | 
			
		||||
# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 | 
			
		||||
# SupportedHashRocketStyles: key, separator, table
 | 
			
		||||
| 
						 | 
				
			
			@ -39,12 +33,6 @@ Layout/HashAlignment:
 | 
			
		|||
    - 'config/initializers/rack_attack.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).
 | 
			
		||||
# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
 | 
			
		||||
Layout/LeadingCommentSpace:
 | 
			
		||||
| 
						 | 
				
			
			@ -52,14 +40,6 @@ Layout/LeadingCommentSpace:
 | 
			
		|||
    - 'config/application.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).
 | 
			
		||||
# Configuration parameters: EnforcedStyle.
 | 
			
		||||
# SupportedStyles: require_no_space, require_space
 | 
			
		||||
| 
						 | 
				
			
			@ -68,19 +48,6 @@ Layout/SpaceInLambdaLiteral:
 | 
			
		|||
    - 'config/environments/production.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.
 | 
			
		||||
Lint/AmbiguousBlockAssociation:
 | 
			
		||||
  Exclude:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -61,8 +61,8 @@ if ENV['S3_ENABLED'] == 'true'
 | 
			
		|||
 | 
			
		||||
    s3_options: {
 | 
			
		||||
      signature_version: ENV.fetch('S3_SIGNATURE_VERSION') { 'v4' },
 | 
			
		||||
      http_open_timeout: ENV.fetch('S3_OPEN_TIMEOUT'){ '5' }.to_i,
 | 
			
		||||
      http_read_timeout: ENV.fetch('S3_READ_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_idle_timeout: 5,
 | 
			
		||||
      retry_limit: 0,
 | 
			
		||||
    }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
WebAuthn.configure do |config|
 | 
			
		||||
  # This value needs to match `window.location.origin` evaluated by
 | 
			
		||||
  # 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
 | 
			
		||||
  config.rp_name = "Mastodon"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue