From: Go MAEDA <maeda@farend.jp>
Date: Thu, 15 Aug 2019 00:53:19 +0000 (+0000)
Subject: Update RuboCop to 0.74.0 (#31509).
X-Git-Tag: 4.1.0~701
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=76788318a77f766e740b349f59ac3759ca7c145e;p=redmine.git

Update RuboCop to 0.74.0 (#31509).


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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 98b585ddf..272fa92d7 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 0.72.0.
+# using RuboCop version 0.74.0.
 # 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
@@ -313,6 +313,7 @@ Layout/IndentationWidth:
   Enabled: false
 
 # Cop supports --auto-correct.
+# Configuration parameters: AllowDoxygenCommentStyle.
 Layout/LeadingCommentSpace:
   Exclude:
     - 'app/controllers/repositories_controller.rb'
@@ -602,6 +603,11 @@ Lint/InterpolationCheck:
   Exclude:
     - 'app/models/user.rb'
 
+# Cop supports --auto-correct.
+Lint/LiteralInInterpolation:
+  Exclude:
+    - 'test/unit/mail_handler_test.rb'
+
 Lint/Loop:
   Exclude:
     - 'lib/redmine/helpers/gantt.rb'
@@ -670,6 +676,7 @@ Lint/UselessAccessModifier:
     - 'app/models/changeset.rb'
     - 'app/models/watcher.rb'
     - 'lib/redmine/themes.rb'
+    - 'test/functional/repositories_git_controller_test.rb'
 
 Lint/UselessAssignment:
   Enabled: false
@@ -1499,20 +1506,9 @@ Style/NumericLiteralPrefix:
     - 'test/unit/user_test.rb'
 
 # Cop supports --auto-correct.
-# Configuration parameters: MinDigits, Strict.
+# Configuration parameters: Strict.
 Style/NumericLiterals:
-  Exclude:
-    - 'db/schema.rb'
-    - 'lib/redmine/database.rb'
-    - 'test/functional/issues_controller_test.rb'
-    - 'test/functional/messages_controller_test.rb'
-    - 'test/helpers/application_helper_test.rb'
-    - 'test/unit/lib/redmine/i18n_test.rb'
-    - 'test/unit/lib/redmine/plugin_test.rb'
-    - 'test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb'
-    - 'test/unit/mail_handler_test.rb'
-    - 'test/unit/search_test.rb'
-    - 'test/unit/time_entry_test.rb'
+  MinDigits: 9
 
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle, IgnoredMethods.
diff --git a/Gemfile b/Gemfile
index ec8d6e245..d244bd2b9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,8 +84,8 @@ group :test do
   gem "capybara", (RUBY_VERSION < "2.4" ? "~> 3.15.1" : "~> 3.25.0")
   gem "selenium-webdriver"
   # RuboCop
-  gem 'rubocop', '~> 0.72.0'
-  gem 'rubocop-rails', '~> 2.1.0'
+  gem 'rubocop', '~> 0.74.0'
+  gem 'rubocop-rails', '~> 2.3.0'
 end
 
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")