Merge remote-tracking branch 'upstream/pull/3544'

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 9b7a28d87e0ad61061f9411371c9f1c3df848902..dc7590df36d3ee5353256fe2f308af287ae0443c 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -4,9 +4,10 @@ require:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
+  - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   NewCops: enable
   Exclude:
     - 'vendor/**/*'
@@ -54,7 +55,7 @@ Rails/HasManyOrHasOneDependent:
 Rails/HttpPositionalArguments:
   Enabled: false
 
-Rails/InverseOf:
+Rails/ReflectionClassName:
   Enabled: false
 
 Rails/SkipsModelValidations:
@@ -95,6 +96,12 @@ Style/MixinUsage:
     - 'bin/setup'
     - 'bin/update'
 
+Style/RedundantCondition:
+  Exclude:
+    - 'app/controllers/messages_controller.rb'
+    - 'app/controllers/sessions_controller.rb'
+    - 'app/controllers/users_controller.rb'
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes