From 13fb54920b1c1e8dd59798dd9fc3466c5a446898 Mon Sep 17 00:00:00 2001
From: Nick Schonning <nschonni@gmail.com>
Date: Mon, 13 May 2024 05:54:15 -0400
Subject: [PATCH] Enable Style/IfUnlessModifier RuboCop (#30260)
---
.rubocop_todo.yml | 9 +--------
config/environments/production.rb | 4 +---
config/initializers/devise.rb | 4 +---
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 91e666d7f..b47d682f3 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --auto-gen-only-exclude --no-exclude-limit --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.62.1.
+# using RuboCop version 1.63.5.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
@@ -122,13 +122,6 @@ Style/HashTransformValues:
- 'app/serializers/rest/web_push_subscription_serializer.rb'
- 'app/services/import_service.rb'
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
- Exclude:
- - 'config/environments/production.rb'
- - 'config/initializers/devise.rb'
- - 'config/initializers/ffmpeg.rb'
-
# This cop supports unsafe autocorrection (--autocorrect-all).
Style/MapToHash:
Exclude:
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6b1101ea1..a39843e95 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -86,9 +86,7 @@ Rails.application.configure do
config.lograge.enabled = true
config.lograge.custom_payload do |controller|
- if controller.respond_to?(:signed_request?) && controller.signed_request?
- { key: controller.signature_key_id }
- end
+ { key: controller.signature_key_id } if controller.respond_to?(:signed_request?) && controller.signed_request?
end
# Use a different logger for distributed setups.
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a95c7437f..5c88c4cd5 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -79,9 +79,7 @@ module Devise
return pass
end
- if validate(resource)
- success!(resource)
- end
+ success!(resource) if validate(resource)
end
private