]> source.dussan.org Git - redmine.git/commitdiff
Update RuboCop to 1.12.0 (#32530).
authorGo MAEDA <maeda@farend.jp>
Thu, 25 Mar 2021 01:08:38 +0000 (01:08 +0000)
committerGo MAEDA <maeda@farend.jp>
Thu, 25 Mar 2021 01:08:38 +0000 (01:08 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@20839 e93f8b46-1217-0410-a6f0-8f06a7374b81

.rubocop_todo.yml
Gemfile

index 02798260f47396e00ba2f0a0d4fc976a08df2ce4..8eb33fc2643340522843e09287bd0ff9e16b70da 100644 (file)
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 20 --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.11.0.
+# using RuboCop version 1.12.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
@@ -368,7 +368,7 @@ Lint/SendWithMixinArgument:
 Lint/ShadowingOuterLocalVariable:
   Enabled: false
 
-# Configuration parameters: AllowComments.
+# Configuration parameters: AllowComments, AllowNil.
 Lint/SuppressedException:
   Exclude:
     - 'app/controllers/activities_controller.rb'
@@ -1150,6 +1150,7 @@ Style/DocumentDynamicEvalDefinition:
   Exclude:
     - 'app/helpers/attachments_helper.rb'
 
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
 
@@ -1540,6 +1541,11 @@ Style/RedundantAssignment:
     - 'lib/redmine/wiki_formatting.rb'
     - 'lib/redmine/wiki_formatting/markdown/formatter.rb'
 
+# Cop supports --auto-correct.
+Style/RedundantBegin:
+  Exclude:
+    - 'app/models/member.rb'
+
 # Cop supports --auto-correct.
 Style/RedundantCondition:
   Exclude:
@@ -1719,6 +1725,11 @@ Style/StderrPuts:
     - 'config/environment.rb'
     - 'config/initializers/10-patches.rb'
 
+# Cop supports --auto-correct.
+Style/StringChars:
+  Exclude:
+    - 'app/models/user.rb'
+
 # Cop supports --auto-correct.
 Style/StringConcatenation:
   Enabled: false
diff --git a/Gemfile b/Gemfile
index 96aef3253edb935c995cefc0f4f08b056a15633d..12e4cae29479985f50a1e666a64b113f839dca48 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ group :test do
   gem "selenium-webdriver"
   gem 'webdrivers', '~> 4.4', require: false
   # RuboCop
-  gem 'rubocop', '~> 1.11.0'
+  gem 'rubocop', '~> 1.12.0'
   gem 'rubocop-performance', '~> 1.10.1'
   gem 'rubocop-rails', '~> 2.9.0'
 end