diff options
| -rw-r--r-- | .rubocop_todo.yml | 7 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | lib/redmine/diff_table.rb | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 33d196bcf..e2b2a566b 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.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 @@ -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 @@ -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 @@ -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 diff --git a/lib/redmine/diff_table.rb b/lib/redmine/diff_table.rb index a768d9af9..55e40a667 100644 --- a/lib/redmine/diff_table.rb +++ b/lib/redmine/diff_table.rb @@ -82,6 +82,7 @@ module Redmine 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) @@ -106,6 +107,7 @@ module Redmine else @file_name = arg end + # rubocop:enable Style/FileNull end def diff_for_added_line |