mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-25 15:09:29 +00:00
Fix Style/TrailingCommaInHashLiteral
cop (#30004)
This commit is contained in:
parent
c7384adc00
commit
369b2ef0ed
|
@ -241,14 +241,6 @@ Style/StringConcatenation:
|
||||||
Exclude:
|
Exclude:
|
||||||
- 'config/initializers/paperclip.rb'
|
- 'config/initializers/paperclip.rb'
|
||||||
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
|
||||||
# Configuration parameters: EnforcedStyleForMultiline.
|
|
||||||
# SupportedStylesForMultiline: comma, consistent_comma, no_comma
|
|
||||||
Style/TrailingCommaInHashLiteral:
|
|
||||||
Exclude:
|
|
||||||
- 'config/environments/production.rb'
|
|
||||||
- 'config/environments/test.rb'
|
|
||||||
|
|
||||||
# This cop supports safe autocorrection (--autocorrect).
|
# This cop supports safe autocorrection (--autocorrect).
|
||||||
# Configuration parameters: WordRegex.
|
# Configuration parameters: WordRegex.
|
||||||
# SupportedStyles: percent, brackets
|
# SupportedStyles: percent, brackets
|
||||||
|
|
|
@ -44,8 +44,8 @@ Rails.application.configure do
|
||||||
config.force_ssl = true
|
config.force_ssl = true
|
||||||
config.ssl_options = {
|
config.ssl_options = {
|
||||||
redirect: {
|
redirect: {
|
||||||
exclude: ->(request) { request.path.start_with?('/health') || request.headers['Host'].end_with?('.onion') || request.headers['Host'].end_with?('.i2p') }
|
exclude: ->(request) { request.path.start_with?('/health') || request.headers['Host'].end_with?('.onion') || request.headers['Host'].end_with?('.i2p') },
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
# Info include generic and useful information about system operation, but avoids logging too much
|
# Info include generic and useful information about system operation, but avoids logging too much
|
||||||
|
|
|
@ -88,7 +88,7 @@ if ENV['PAM_ENABLED'] == 'true'
|
||||||
usernames: Set['pam_user1', 'pam_user2'],
|
usernames: Set['pam_user1', 'pam_user2'],
|
||||||
servicenames: Set['pam_test', 'pam_test_controlled'],
|
servicenames: Set['pam_test', 'pam_test_controlled'],
|
||||||
password: '123456',
|
password: '123456',
|
||||||
env: { email: 'pam@example.com' }
|
env: { email: 'pam@example.com' },
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue