From 369b2ef0ed666686958cdbf81d52b5173c108e61 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 19 Apr 2024 16:52:01 -0400 Subject: [PATCH] Fix `Style/TrailingCommaInHashLiteral` cop (#30004) --- .rubocop_todo.yml | 8 -------- config/environments/production.rb | 4 ++-- config/environments/test.rb | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 5354c54887..0bc9d2831c 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -241,14 +241,6 @@ Style/StringConcatenation: Exclude: - '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 diff --git a/config/environments/production.rb b/config/environments/production.rb index 6587acfb3a..49e02b53d3 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 0b2f57fba7..13e1973380 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