From 679ba509da39fa1537db9e5c0321d280cb44ad52 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 9 Aug 2023 23:42:42 +0000 Subject: [PATCH] Update RuboCop to 1.56 (#36919). git-svn-id: https://svn.redmine.org/redmine/trunk@22278 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop.yml | 6 ++++++ .rubocop_todo.yml | 24 +----------------------- Gemfile | 2 +- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 89564b5a1..d7f870235 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -73,6 +73,9 @@ Layout/SpaceBeforeBlockBraces: # str = path.to_s.split(%r{[/\\]}).select{|p| !p.blank?}.join("/") Enabled: false +Layout/SpaceBeforeFirstArg: + Enabled: false + Layout/SpaceInsideBlockBraces: Enabled: false @@ -239,6 +242,9 @@ Style/SlicingWithRange: Style/SoleNestedConditional: Enabled: false +Style/StringLiteralsInInterpolation: + Enabled: false + Style/TernaryParentheses: Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index c10ebc8d4..7261428c5 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.54.2. +# using RuboCop version 1.56.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 @@ -221,16 +221,6 @@ Layout/SpaceAfterNot: Layout/SpaceAroundOperators: Enabled: false -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AllowForAlignment. -Layout/SpaceBeforeFirstArg: - Exclude: - - 'test/helpers/issues_helper_test.rb' - - 'test/unit/lib/redmine/menu_manager_test.rb' - - 'test/unit/repository_git_test.rb' - - 'test/unit/token_test.rb' - - 'test/unit/user_import_test.rb' - # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets. # SupportedStyles: space, no_space, compact @@ -1615,18 +1605,6 @@ Style/StringConcatenation: Style/StringLiterals: Enabled: false -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle. -# SupportedStyles: single_quotes, double_quotes -Style/StringLiteralsInInterpolation: - Exclude: - - 'app/models/issue_query.rb' - - 'config/environment.rb' - - 'lib/redmine/scm/adapters/cvs_adapter.rb' - - 'lib/redmine/wiki_formatting/links_helper.rb' - - 'lib/redmine/wiki_formatting/textile/redcloth3.rb' - - 'test/unit/member_test.rb' - # This cop supports unsafe autocorrection (--autocorrect-all). Style/StructInheritance: Exclude: diff --git a/Gemfile b/Gemfile index 70e1d139c..ae8695fb0 100644 --- a/Gemfile +++ b/Gemfile @@ -103,7 +103,7 @@ group :test do gem "selenium-webdriver", "~> 3.142.7" gem 'webdrivers', '4.6.1', require: false # RuboCop - gem 'rubocop', '~> 1.54.0', require: false + gem 'rubocop', '~> 1.56.0', require: false gem 'rubocop-performance', '~> 1.18.0', require: false gem 'rubocop-rails', '~> 2.20.2', require: false end -- 2.39.5