Skip to content

Commit

Permalink
Update RuboCop to 1.69 (#41884).
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.redmine.org/redmine/trunk@23316 e93f8b46-1217-0410-a6f0-8f06a7374b81
  • Loading branch information
vividtone committed Nov 28, 2024
1 parent bb8e25f commit 5e9b2e9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 4 additions & 3 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -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.68.0.
# using RuboCop version 1.69.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
Expand Down Expand Up @@ -238,7 +238,8 @@ Lint/UnusedBlockArgument:
Enabled: false

# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
# NotImplementedExceptions: NotImplementedError
Lint/UnusedMethodArgument:
Enabled: false

Expand Down Expand Up @@ -1328,7 +1329,7 @@ Style/ZeroLengthPredicate:
- 'test/unit/custom_field_test.rb'

# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
# URISchemes: http, https
Layout/LineLength:
Max: 194
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ group :test do
gem "capybara", ">= 3.39"
gem 'selenium-webdriver', '>= 4.11.0'
# RuboCop
gem 'rubocop', '~> 1.68.0', require: false
gem 'rubocop', '~> 1.69.0', require: false
gem 'rubocop-performance', '~> 1.23.0', require: false
gem 'rubocop-rails', '~> 2.27.0', require: false
gem 'bundle-audit', require: false
Expand Down
2 changes: 2 additions & 0 deletions lib/redmine/diff_table.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def inspect
private

def file_name=(arg)
# rubocop:disable Style/FileNull
both_git_diff = false
if file_name.nil?
@git_diff = true if %r{^(a/|/dev/null)}.match?(arg)
Expand All @@ -106,6 +107,7 @@ def file_name=(arg)
else
@file_name = arg
end
# rubocop:enable Style/FileNull
end

def diff_for_added_line
Expand Down

0 comments on commit 5e9b2e9

Please sign in to comment.