summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Jankowski <matt@jankowski.online>2024-04-19 16:52:01 -0400
committerGitHub <noreply@github.com>2024-04-19 20:52:01 +0000
commit369b2ef0ed666686958cdbf81d52b5173c108e61 (patch)
tree98b324de6f4d8a374aa9218efdeb980d64658801
parentc7384adc0087cb91d60b0f572aab14420271e608 (diff)
Fix `Style/TrailingCommaInHashLiteral` cop (#30004)
-rw-r--r--.rubocop_todo.yml8
-rw-r--r--config/environments/production.rb4
-rw-r--r--config/environments/test.rb2
3 files changed, 3 insertions, 11 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5354c54887d..0bc9d2831c9 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -242,14 +242,6 @@ Style/StringConcatenation:
- '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).
# Configuration parameters: WordRegex.
# SupportedStyles: percent, brackets
Style/WordArray:
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6587acfb3ac..49e02b53d39 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -44,8 +44,8 @@ Rails.application.configure do
config.force_ssl = true
config.ssl_options = {
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
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 0b2f57fba7c..13e19733807 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -88,7 +88,7 @@ if ENV['PAM_ENABLED'] == 'true'
usernames: Set['pam_user1', 'pam_user2'],
servicenames: Set['pam_test', 'pam_test_controlled'],
password: '123456',
- env: { email: 'pam@example.com' }
+ env: { email: 'pam@example.com' },
}
end