Fix rubocop `Layout/ArgumentAlignment` cop (#26060)

pull/26063/head
Matt Jankowski 2023-09-28 09:48:47 -04:00 committed by GitHub
parent e6b903b21e
commit 56c0babc0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 34 deletions

View File

@ -13,14 +13,6 @@ Bundler/OrderedGems:
Exclude: Exclude:
- 'Gemfile' - 'Gemfile'
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle, IndentationWidth.
# SupportedStyles: with_first_argument, with_fixed_indentation
Layout/ArgumentAlignment:
Exclude:
- 'config/initializers/cors.rb'
- 'config/initializers/session_store.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
@ -841,6 +833,5 @@ Style/TrailingCommaInHashLiteral:
Style/WordArray: Style/WordArray:
Exclude: Exclude:
- 'app/helpers/languages_helper.rb' - 'app/helpers/languages_helper.rb'
- 'config/initializers/cors.rb'
- 'spec/controllers/settings/imports_controller_spec.rb' - 'spec/controllers/settings/imports_controller_spec.rb'
- 'spec/models/form/import_spec.rb' - 'spec/models/form/import_spec.rb'

View File

@ -11,26 +11,16 @@ Rails.application.config.middleware.insert_before 0, Rack::Cors do
allow do allow do
origins '*' origins '*'
resource '/.well-known/*', with_options headers: :any, credentials: false do
headers: :any, with_options methods: [:get] do
methods: [:get], resource '/.well-known/*'
credentials: false resource '/@:username'
resource '/@:username', resource '/users/:username'
headers: :any, end
methods: [:get],
credentials: false
resource '/users/:username',
headers: :any,
methods: [:get],
credentials: false
resource '/api/*', resource '/api/*',
headers: :any, expose: %w(Link X-RateLimit-Reset X-RateLimit-Limit X-RateLimit-Remaining X-Request-Id),
methods: [:post, :put, :delete, :get, :patch, :options], methods: %i(post put delete get patch options)
credentials: false, resource '/oauth/token', methods: [:post]
expose: ['Link', 'X-RateLimit-Reset', 'X-RateLimit-Limit', 'X-RateLimit-Remaining', 'X-Request-Id'] end
resource '/oauth/token',
headers: :any,
methods: [:post],
credentials: false
end end
end end

View File

@ -2,7 +2,10 @@
# Be sure to restart your server when you modify this file. # Be sure to restart your server when you modify this file.
Rails.application.config.session_store :cookie_store, Rails
.application
.config
.session_store :cookie_store,
key: '_mastodon_session', key: '_mastodon_session',
secure: false, # All cookies have their secure flag set by the force_ssl option in production secure: false, # All cookies have their secure flag set by the force_ssl option in production
same_site: :lax same_site: :lax