summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.rubocop_todo.yml15
-rw-r--r--Gemfile2
2 files changed, 14 insertions, 3 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 02798260f..8eb33fc26 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.11.0.
+# using RuboCop version 1.12.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
@@ -368,7 +368,7 @@ Lint/SendWithMixinArgument:
Lint/ShadowingOuterLocalVariable:
Enabled: false
-# Configuration parameters: AllowComments.
+# Configuration parameters: AllowComments, AllowNil.
Lint/SuppressedException:
Exclude:
- 'app/controllers/activities_controller.rb'
@@ -1150,6 +1150,7 @@ Style/DocumentDynamicEvalDefinition:
Exclude:
- 'app/helpers/attachments_helper.rb'
+# Configuration parameters: AllowedConstants.
Style/Documentation:
Enabled: false
@@ -1541,6 +1542,11 @@ Style/RedundantAssignment:
- 'lib/redmine/wiki_formatting/markdown/formatter.rb'
# Cop supports --auto-correct.
+Style/RedundantBegin:
+ Exclude:
+ - 'app/models/member.rb'
+
+# Cop supports --auto-correct.
Style/RedundantCondition:
Exclude:
- 'app/controllers/messages_controller.rb'
@@ -1720,6 +1726,11 @@ Style/StderrPuts:
- 'config/initializers/10-patches.rb'
# Cop supports --auto-correct.
+Style/StringChars:
+ Exclude:
+ - 'app/models/user.rb'
+
+# Cop supports --auto-correct.
Style/StringConcatenation:
Enabled: false
diff --git a/Gemfile b/Gemfile
index 96aef3253..12e4cae29 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ group :test do
gem "selenium-webdriver"
gem 'webdrivers', '~> 4.4', require: false
# RuboCop
- gem 'rubocop', '~> 1.11.0'
+ gem 'rubocop', '~> 1.12.0'
gem 'rubocop-performance', '~> 1.10.1'
gem 'rubocop-rails', '~> 2.9.0'
end