From: Go MAEDA Date: Sun, 1 May 2022 05:51:51 +0000 (+0000) Subject: Update RuboCop to 1.28 (#36919). X-Git-Tag: 5.1.0~619 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d2ce08e794508fef3e952c3a6f98c2017e325cba;p=redmine.git 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 9ff7d5e2f..be6dfc461 100644 --- 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 9b7058710..b731f7ee2 100644 --- 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 81ac1e506..9bf1b3d9e 100644 --- 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