Update RuboCop Rails to 2.18 (#37248).

git-svn-id: https://svn.redmine.org/redmine/trunk@22154 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.rubocop.yml b/.rubocop.yml
index f929a55dcfe8b75bfb9ba8579372ce97d764aba9..398fac7075bd9362e21f63aadc8b520262c6eaf3 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -209,6 +209,10 @@ Style/IdenticalConditionalBranches:
     - 'config/initializers/10-patches.rb'
     - 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
 
+Style/InverseMethods:
+    InverseMethods:
+      :include?: ~
+
 Style/NegatedIfElseCondition:
   Enabled: false
 

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 67ece8457927e71f9ed36166d527fbbb6e736c13..06404cd65624ddfc2763b63cdeb73860829ae53b 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -211,7 +211,6 @@ Layout/SpaceAfterNot:
     - 'test/functional/workflows_controller_test.rb'
     - 'test/unit/attachment_test.rb'
     - 'test/unit/lib/redmine/export/pdf_test.rb'
-    - 'test/unit/project_copy_test.rb'
     - 'test/unit/project_test.rb'
     - 'test/unit/query_test.rb'
     - 'test/unit/role_test.rb'
@@ -483,7 +482,7 @@ Rails/ActiveRecordCallbacksOrder:
     - 'app/models/version.rb'
     - 'app/models/wiki_page.rb'
 
-# Configuration parameters: Include.
+# Configuration parameters: Severity, Include.
 # Include: app/models/**/*.rb
 Rails/ActiveRecordOverride:
   Exclude:
@@ -545,6 +544,7 @@ Rails/CreateTableWithTimestamps:
 Rails/Date:
   Enabled: false
 
+# Configuration parameters: Severity.
 Rails/DuplicateScope:
   Exclude:
     - 'app/models/enumeration.rb'
@@ -571,10 +571,9 @@ Rails/Exit:
     - 'config/routes.rb'
 
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Include, AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: Include, AllowedMethods, AllowedPatterns.
 # Include: app/models/**/*.rb
 # AllowedMethods: order, limit, select, lock
-# IgnoredMethods: order, limit, select, lock
 Rails/FindEach:
   Exclude:
     - 'app/models/auth_source.rb'

diff --git a/Gemfile b/Gemfile
index 7a2d1e6ddeb683c7ca9a556488a127880e17a501..293866b57ea9c67a9f06e17064536350efd8ad45 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -105,7 +105,7 @@ group :test do
   # RuboCop
   gem 'rubocop', '~> 1.48.1', require: false
   gem 'rubocop-performance', '~> 1.16.0', require: false
-  gem 'rubocop-rails', '~> 2.17.2', require: false
+  gem 'rubocop-rails', '~> 2.18.0', require: false
 end
 
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")