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

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index aa60df305e2613659f470ffcafb57dce3c22941e..dc7590df36d3ee5353256fe2f308af287ae0443c 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -55,9 +55,6 @@ Rails/HasManyOrHasOneDependent:
 Rails/HttpPositionalArguments:
   Enabled: false
 
-Rails/InverseOf:
-  Enabled: false
-
 Rails/ReflectionClassName:
   Enabled: false
 
@@ -99,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