Update RuboCop to 1.28 (#36919).

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

diff --git a/.rubocop.yml b/.rubocop.yml
index 9ff7d5e2f2dd68050e87f12ca6d46e5be2729219..be6dfc46180402b99fb979b8c1540c17776e88eb 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -52,7 +52,7 @@ Layout/FirstHashElementIndentation:
 
 Layout/LineLength:
   Enabled: true
-  IgnoredPatterns: ['\A\s+test \".+\" do\z', '\A\s*\#']
+  AllowedPatterns: ['\A\s+test \".+\" do\z', '\A\s*\#']
   Exclude:
     - 'db/migrate/0*.rb'
     - 'db/migrate/1*.rb'
@@ -149,6 +149,9 @@ Style/BlockDelimiters:
     - 'lib/redmine/string_array_diff/diff.rb'
     - 'lib/redmine/string_array_diff/diffable.rb'
 
+Style/FetchEnvVar:
+  Enabled: false
+
 Style/EmptyElse:
   EnforcedStyle: empty
 

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 9b705871049dc3f50a9a8dbd58ae2cb65c4ee589..b731f7ee2d4d1666890b4d5b2ef82bb0cbf41cb7 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -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.27.0.
+# using RuboCop version 1.28.2.
 # 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
@@ -140,7 +140,7 @@ Layout/HashAlignment:
   Enabled: false
 
 # This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: Width, IgnoredPatterns.
+# Configuration parameters: Width, AllowedPatterns, IgnoredPatterns.
 Layout/IndentationWidth:
   Exclude:
     - 'db/migrate/20110902000000_create_changeset_parents.rb'
@@ -444,7 +444,7 @@ Naming/MemoizedInstanceVariableName:
     - 'lib/redmine/helpers/calendar.rb'
     - 'lib/redmine/search.rb'
 
-# Configuration parameters: EnforcedStyle, IgnoredPatterns.
+# Configuration parameters: EnforcedStyle, AllowedPatterns, IgnoredPatterns.
 # SupportedStyles: snake_case, camelCase
 Naming/MethodName:
   Exclude:
@@ -1267,7 +1267,7 @@ Style/GlobalVars:
   Exclude:
     - 'test/test_helper.rb'
 
-# Configuration parameters: MinBodyLength.
+# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
 Style/GuardClause:
   Enabled: false
 
@@ -1762,7 +1762,7 @@ Style/SoleNestedConditional:
 
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: RequireEnglish.
-# SupportedStyles: use_perl_names, use_english_names
+# SupportedStyles: use_perl_names, use_english_names, use_builtin_english_names
 Style/SpecialGlobalVars:
   EnforcedStyle: use_perl_names
 
@@ -1813,7 +1813,7 @@ Style/SymbolArray:
   EnforcedStyle: brackets
 
 # This cop supports unsafe auto-correction (--auto-correct-all).
-# Configuration parameters: AllowMethodsWithArguments, IgnoredMethods.
+# Configuration parameters: AllowMethodsWithArguments, IgnoredMethods, AllowComments.
 # IgnoredMethods: respond_to, define_method
 Style/SymbolProc:
   Enabled: false
@@ -1873,7 +1873,7 @@ Style/ZeroLengthPredicate:
     - 'test/unit/custom_field_test.rb'
 
 # This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 194

diff --git a/Gemfile b/Gemfile
index 81ac1e50663da78a906b731a4750ea62f032cd57..9bf1b3d9e92a827963bf9a0add604c057c669411 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ group :test do
   gem "selenium-webdriver", "~> 3.142.7"
   gem 'webdrivers', '4.6.1', require: false
   # RuboCop
-  gem 'rubocop', '~> 1.27.0'
+  gem 'rubocop', '~> 1.28.2'
   gem 'rubocop-performance', '~> 1.13.0'
   gem 'rubocop-rails', '~> 2.14.0'
 end