From 2376d29a936e2613e69bdc9bd127378fe40270a9 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 5 Nov 2025 07:10:58 +0000 Subject: [PATCH] Update RuboCop to 1.81 (#43437). git-svn-id: https://svn.redmine.org/redmine/trunk@24124 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop.yml | 6 ++++++ .rubocop_todo.yml | 46 ++++++++++------------------------------------ Gemfile | 2 +- 3 files changed, 17 insertions(+), 37 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 77857c9cd..e9aa2116d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -34,6 +34,9 @@ Layout/ClosingParenthesisIndentation: Exclude: - 'lib/redmine/wiki_formatting/textile/redcloth3.rb' +Layout/EmptyLinesAfterModuleInclusion: + Enabled: false + Layout/EmptyLinesAroundAccessModifier: Exclude: - 'config/initializers/10-patches.rb' @@ -224,6 +227,9 @@ Style/BlockDelimiters: - 'lib/redmine/string_array_diff/diff.rb' - 'lib/redmine/string_array_diff/diffable.rb' +Style/CollectionQuerying: + Enabled: false + Style/EmptyStringInsideInterpolation: Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index b9189c667..4129c73d5 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.76.2. +# using RuboCop version 1.81.7. # 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 @@ -230,23 +230,22 @@ Lint/SuppressedException: - 'lib/redmine/scm/adapters/subversion_adapter.rb' # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AutoCorrect, IgnoreEmptyBlocks, AllowUnusedKeywordArguments. +# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments. Lint/UnusedBlockArgument: Enabled: false # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions. +# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions. # NotImplementedExceptions: NotImplementedError Lint/UnusedMethodArgument: Enabled: false # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AutoCorrect. Lint/UselessAssignment: Enabled: false # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AutoCorrect, CheckForMethodsWithNoSideEffects. +# Configuration parameters: CheckForMethodsWithNoSideEffects. Lint/Void: Exclude: - 'app/models/query.rb' @@ -325,8 +324,7 @@ Naming/VariableNumber: - 'test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb' - 'test/unit/project_test.rb' -# Configuration parameters: Severity, Include. -# Include: **/app/models/**/*.rb +# Configuration parameters: Severity. Rails/ActiveRecordOverride: Exclude: - 'app/models/email_address.rb' @@ -347,8 +345,6 @@ Rails/ApplicationMailer: - 'app/models/mailer.rb' # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: Include. -# Include: **/test/**/* Rails/AssertNot: Enabled: false @@ -367,8 +363,6 @@ Rails/Blank: - 'lib/redmine/field_format.rb' - 'lib/redmine/wiki_formatting/macros.rb' -# Configuration parameters: Include. -# Include: db/**/*.rb Rails/CreateTableWithTimestamps: Enabled: false @@ -396,16 +390,12 @@ Rails/EagerEvaluationLogMessage: Exclude: - 'app/controllers/application_controller.rb' -# Configuration parameters: Include. -# Include: **/app/**/*.rb, **/config/**/*.rb, **/lib/**/*.rb Rails/Exit: Exclude: - 'config/environment.rb' - 'config/initializers/10-patches.rb' - 'config/routes.rb' -# Configuration parameters: Include. -# Include: **/app/models/**/*.rb Rails/HasAndBelongsToMany: Exclude: - 'app/models/changeset.rb' @@ -419,8 +409,6 @@ Rails/HasAndBelongsToMany: - 'app/models/tracker.rb' - 'app/models/user.rb' -# Configuration parameters: Include. -# Include: **/app/models/**/*.rb Rails/HasManyOrHasOneDependent: Exclude: - 'app/models/auth_source.rb' @@ -437,8 +425,6 @@ Rails/HasManyOrHasOneDependent: - 'app/models/wiki.rb' - 'app/models/wiki_page.rb' -# Configuration parameters: Include. -# Include: spec/**/*.rb, test/**/*.rb Rails/I18nLocaleAssignment: Exclude: - 'test/helpers/application_helper_test.rb' @@ -453,8 +439,7 @@ Rails/I18nLocaleTexts: Exclude: - 'app/models/mailer.rb' -# Configuration parameters: IgnoreScopes, Include. -# Include: **/app/models/**/*.rb +# Configuration parameters: IgnoreScopes. Rails/InverseOf: Exclude: - 'app/models/board.rb' @@ -477,8 +462,6 @@ Rails/InverseOf: - 'app/models/wiki.rb' - 'app/models/wiki_page.rb' -# Configuration parameters: Include. -# Include: **/app/controllers/**/*.rb, **/app/mailers/**/*.rb Rails/LexicallyScopedActionFilter: Exclude: - 'app/controllers/projects_controller.rb' @@ -489,8 +472,6 @@ Rails/LinkToBlank: - 'app/helpers/avatars_helper.rb' # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: Include. -# Include: **/config/routes.rb, **/config/routes/**/*.rb Rails/MatchRoute: Exclude: - 'config/routes.rb' @@ -526,8 +507,6 @@ Rails/Present: Enabled: false # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: Include. -# Include: **/app/models/**/*.rb Rails/ReadWriteAttribute: Exclude: - 'app/models/auth_source_ldap.rb' @@ -544,17 +523,14 @@ Rails/RedundantForeignKey: - 'app/models/role.rb' # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: Include. -# Include: spec/**/*.rb, test/**/*.rb Rails/RedundantTravelBack: Exclude: - 'test/integration/sudo_mode_test.rb' - 'test/system/sudo_mode_test.rb' # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: EnforcedStyle, Include. +# Configuration parameters: EnforcedStyle. # SupportedStyles: assert_not, refute -# Include: **/test/**/* Rails/RefuteMethods: Exclude: - 'test/functional/projects_controller_test.rb' @@ -585,8 +561,6 @@ Rails/TimeZone: Enabled: false # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: Include. -# Include: **/app/models/**/*.rb Rails/Validation: Enabled: false @@ -795,14 +769,14 @@ Style/EmptyCaseCondition: - 'app/models/issue_priority.rb' # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AutoCorrect, EnforcedStyle, AllowComments. +# Configuration parameters: EnforcedStyle, AllowComments. # SupportedStyles: empty, nil, both Style/EmptyElse: Exclude: - 'app/models/mail_handler.rb' # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AutoCorrect, EnforcedStyle. +# Configuration parameters: EnforcedStyle. # SupportedStyles: compact, expanded Style/EmptyMethod: Enabled: false @@ -1288,7 +1262,7 @@ Style/ZeroLengthPredicate: - 'test/unit/custom_field_test.rb' # This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings. +# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings. # URISchemes: http, https Layout/LineLength: Max: 194 diff --git a/Gemfile b/Gemfile index b01270c5e..165f79451 100644 --- a/Gemfile +++ b/Gemfile @@ -117,7 +117,7 @@ group :test do gem "capybara", ">= 3.39" gem 'selenium-webdriver', '>= 4.11.0' # RuboCop - gem 'rubocop', '~> 1.76.0', require: false + gem 'rubocop', '~> 1.81.7', require: false gem 'rubocop-performance', '~> 1.26.0', require: false gem 'rubocop-rails', '~> 2.32.0', require: false gem 'bundle-audit', require: false