From: Go MAEDA <maeda@farend.jp>
Date: Tue, 1 Oct 2019 03:18:39 +0000 (+0000)
Subject: Update RuboCop to 0.75.0 (#31509).
X-Git-Tag: 4.1.0~507
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cd7a5c2f2f48c4b75822041c1d4652fa0ab0f155;p=redmine.git

Update RuboCop to 0.75.0 (#31509).


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

diff --git a/.rubocop.yml b/.rubocop.yml
index 0211aa761..0da6b1ce7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -57,6 +57,9 @@ Rails/BulkChangeTable:
 Rails/HelperInstanceVariable:
   Enabled: false
 
+Style/FormatStringToken:
+  Enabled: false
+
 Style/FrozenStringLiteralComment:
   Enabled: true
   EnforcedStyle: always
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 133143fd5..dcced06d0 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.74.0.
+# using RuboCop version 0.75.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
@@ -151,7 +151,22 @@ Layout/EmptyLineBetweenDefs:
 
 # Cop supports --auto-correct.
 Layout/EmptyLines:
-  Enabled: false
+  Exclude:
+    - 'app/models/issue.rb'
+    - 'app/models/time_entry_import.rb'
+    - 'config/routes.rb'
+    - 'db/migrate/001_setup.rb'
+    - 'lib/redmine/sudo_mode.rb'
+    - 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
+    - 'test/functional/activities_controller_test.rb'
+    - 'test/functional/email_addresses_controller_test.rb'
+    - 'test/functional/project_enumerations_controller_test.rb'
+    - 'test/functional/settings_controller_test.rb'
+    - 'test/functional/users_controller_test.rb'
+    - 'test/helpers/application_helper_test.rb'
+    - 'test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb'
+    - 'test/unit/project_test.rb'
+    - 'test/unit/query_test.rb'
 
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -549,6 +564,12 @@ Lint/ParenthesesAsGroupedExpression:
     - 'test/unit/attachment_test.rb'
     - 'test/unit/lib/redmine/export/pdf_test.rb'
 
+# Cop supports --auto-correct.
+Lint/SendWithMixinArgument:
+  Exclude:
+    - 'lib/redmine/acts/positioned.rb'
+    - 'test/object_helpers.rb'
+
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 
@@ -587,7 +608,6 @@ 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
@@ -632,7 +652,7 @@ Naming/MemoizedInstanceVariableName:
     - 'lib/redmine/helpers/calendar.rb'
     - 'lib/redmine/search.rb'
 
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, IgnoredPatterns.
 # SupportedStyles: snake_case, camelCase
 Naming/MethodName:
   Exclude:
@@ -1150,17 +1170,6 @@ Style/FormatString:
     - 'lib/redmine/i18n.rb'
     - 'lib/redmine/info.rb'
 
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: annotated, template, unannotated
-Style/FormatStringToken:
-  Exclude:
-    - 'app/models/query.rb'
-    - 'lib/redmine/helpers/gantt.rb'
-    - 'lib/redmine/i18n.rb'
-    - 'lib/redmine/info.rb'
-    - 'test/helpers/application_helper_test.rb'
-    - 'test/unit/lib/redmine/unified_diff_test.rb'
-
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Exclude:
diff --git a/Gemfile b/Gemfile
index 526d30139..9beea93ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,7 +84,7 @@ group :test do
   gem "capybara", (RUBY_VERSION < "2.4" ? "~> 3.15.1" : "~> 3.25.0")
   gem "selenium-webdriver"
   # RuboCop
-  gem 'rubocop', '~> 0.74.0'
+  gem 'rubocop', '~> 0.75.0'
   gem 'rubocop-performance', '~> 1.4.1'
   gem 'rubocop-rails', '~> 2.3.0'
 end