summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.rubocop_todo.yml70
-rw-r--r--Gemfile2
2 files changed, 39 insertions, 33 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 220506289..5cff1020d 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 0.75.0.
+# using RuboCop version 0.76.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
@@ -534,7 +534,7 @@ Naming/RescuedExceptionsVariableName:
- 'lib/redmine/scm/adapters/filesystem_adapter.rb'
# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: io, id, to, by, on, in, at, ip, db
+# AllowedNames: io, id, to, by, on, in, at, ip, db, os
Naming/UncommunicativeMethodParamName:
Enabled: false
@@ -592,8 +592,14 @@ Performance/StringReplacement:
- 'app/helpers/settings_helper.rb'
- 'lib/redmine/core_ext/string/conversions.rb'
- 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
+ - 'test/functional/repositories_cvs_controller_test.rb'
+ - 'test/functional/repositories_git_controller_test.rb'
- 'test/helpers/application_helper_test.rb'
+ - 'test/integration/repositories_git_test.rb'
+ - 'test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb'
- 'test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb'
+ - 'test/unit/repository_cvs_test.rb'
+ - 'test/unit/repository_git_test.rb'
# Configuration parameters: Include.
# Include: app/models/**/*.rb
@@ -1404,6 +1410,13 @@ Style/RaiseArgs:
- 'lib/redmine/sort_criteria.rb'
# Cop supports --auto-correct.
+Style/RedundantCondition:
+ Exclude:
+ - 'app/controllers/messages_controller.rb'
+ - 'app/controllers/previews_controller.rb'
+ - 'app/models/issue.rb'
+
+# Cop supports --auto-correct.
Style/RedundantConditional:
Exclude:
- 'app/controllers/workflows_controller.rb'
@@ -1412,6 +1425,21 @@ Style/RedundantConditional:
- 'lib/redmine/field_format.rb'
# Cop supports --auto-correct.
+Style/RedundantInterpolation:
+ Exclude:
+ - 'app/helpers/my_helper.rb'
+ - 'app/helpers/queries_helper.rb'
+ - 'app/models/query.rb'
+ - 'app/views/common/feed.atom.builder'
+ - 'app/views/journals/index.builder'
+ - 'lib/redmine/helpers/time_report.rb'
+ - 'lib/redmine/scm/adapters/subversion_adapter.rb'
+ - 'lib/redmine/wiki_formatting.rb'
+ - 'test/functional/versions_controller_test.rb'
+ - 'test/functional/watchers_controller_test.rb'
+ - 'test/unit/repository_mercurial_test.rb'
+
+# Cop supports --auto-correct.
Style/RedundantParentheses:
Exclude:
- 'app/controllers/search_controller.rb'
@@ -1443,6 +1471,14 @@ Style/RedundantSelf:
Enabled: false
# Cop supports --auto-correct.
+Style/RedundantSort:
+ Exclude:
+ - 'app/models/import.rb'
+ - 'lib/redmine/scm/adapters/abstract_adapter.rb'
+ - 'test/functional/issues_controller_test.rb'
+ - 'test/unit/member_test.rb'
+
+# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
# SupportedStyles: slashes, percent_r, mixed
Style/RegexpLiteral:
@@ -1604,36 +1640,6 @@ Style/UnlessElse:
- 'lib/redmine/unified_diff.rb'
# Cop supports --auto-correct.
-Style/UnneededCondition:
- Exclude:
- - 'app/controllers/messages_controller.rb'
- - 'app/controllers/previews_controller.rb'
- - 'app/models/issue.rb'
-
-# Cop supports --auto-correct.
-Style/UnneededInterpolation:
- Exclude:
- - 'app/helpers/my_helper.rb'
- - 'app/helpers/queries_helper.rb'
- - 'app/models/query.rb'
- - 'app/views/common/feed.atom.builder'
- - 'app/views/journals/index.builder'
- - 'lib/redmine/helpers/time_report.rb'
- - 'lib/redmine/scm/adapters/subversion_adapter.rb'
- - 'lib/redmine/wiki_formatting.rb'
- - 'test/functional/versions_controller_test.rb'
- - 'test/functional/watchers_controller_test.rb'
- - 'test/unit/repository_mercurial_test.rb'
-
-# Cop supports --auto-correct.
-Style/UnneededSort:
- Exclude:
- - 'app/models/import.rb'
- - 'lib/redmine/scm/adapters/abstract_adapter.rb'
- - 'test/functional/issues_controller_test.rb'
- - 'test/unit/member_test.rb'
-
-# Cop supports --auto-correct.
Style/VariableInterpolation:
Exclude:
- 'lib/redmine/configuration.rb'
diff --git a/Gemfile b/Gemfile
index d964de977..587bdb101 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,7 +84,7 @@ group :test do
gem "capybara", (RUBY_VERSION < "2.4" ? "~> 3.15.1" : "~> 3.25.0")
gem "selenium-webdriver"
# RuboCop
- gem 'rubocop', '~> 0.75.0'
+ gem 'rubocop', '~> 0.76.0'
gem 'rubocop-performance', '~> 1.5.0'
gem 'rubocop-rails', '~> 2.3.0'
end