summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-05-18 02:42:16 +0000
committerGo MAEDA <maeda@farend.jp>2021-05-18 02:42:16 +0000
commit2115569e83006c0f41152b80f49220c3fc180506 (patch)
treeafda2b74d9aa2d3e8fdc08fc87074b955ad43255
parenta9aae29708b4c96dbe3756ab791e2c4319dcdfca (diff)
downloadredmine-2115569e83006c0f41152b80f49220c3fc180506.tar.gz
redmine-2115569e83006c0f41152b80f49220c3fc180506.zip
Update RuboCop to 1.15 (#35136).
git-svn-id: http://svn.redmine.org/redmine/trunk@21004 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--.rubocop_todo.yml9
-rw-r--r--Gemfile2
2 files changed, 8 insertions, 3 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0e74c648d..205a33a45 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,12 +1,18 @@
# This configuration was generated by
# `rubocop --auto-gen-config --exclude-limit 20 --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.14.0.
+# using RuboCop version 1.15.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
# versions of RuboCop, may require this file to be generated again.
# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+ Enabled: false
+
+# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle.
# SupportedStyles: leading, trailing
Layout/DotPosition:
@@ -301,7 +307,6 @@ Lint/EmptyBlock:
- 'app/models/auth_source_ldap.rb'
- 'lib/redmine/scm/adapters/abstract_adapter.rb'
- 'test/helpers/application_helper_test.rb'
- - 'test/unit/lib/redmine/menu_manager/menu_item_test.rb'
- 'test/unit/lib/redmine/plugin_test.rb'
Lint/FloatComparison:
diff --git a/Gemfile b/Gemfile
index 99ed8e331..d84374b57 100644
--- a/Gemfile
+++ b/Gemfile
@@ -92,7 +92,7 @@ group :test do
gem "selenium-webdriver"
gem 'webdrivers', '~> 4.4', require: false
# RuboCop
- gem 'rubocop', '~> 1.14.0'
+ gem 'rubocop', '~> 1.15.0'
gem 'rubocop-performance', '~> 1.11.0'
gem 'rubocop-rails', '~> 2.10.1'
end