summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-08-03 07:50:03 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-08-03 07:50:03 +0000
commit3d357bcd84cd9dbbad411d7d61123e278b158d35 (patch)
treee5c799033c01c10a9e0bde72bdc89f722b969e5c
parent20570cd408602a081f24513b24aa6e1e387748ad (diff)
downloadredmine-3d357bcd84cd9dbbad411d7d61123e278b158d35.tar.gz
redmine-3d357bcd84cd9dbbad411d7d61123e278b158d35.zip
rubocop: use Layout/TrailingWhitespace AllowInHeredoc true
git-svn-id: http://svn.redmine.org/redmine/trunk@18342 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--.rubocop.yml3
-rw-r--r--.rubocop_todo.yml6
2 files changed, 3 insertions, 6 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 52c0b7508..10c3b50ec 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -24,6 +24,9 @@ require:
Layout/SpaceBeforeBlockBraces:
Enabled: false
+Layout/TrailingWhitespace:
+ AllowInHeredoc: true
+
Metrics:
Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 50960b42a..9c57bc7de 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -542,12 +542,6 @@ Layout/TrailingBlankLines:
- 'test/integration/api_test/my_test.rb'
- 'test/unit/lib/redmine/hook_test.rb'
-# Cop supports --auto-correct.
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
- Exclude:
- - 'test/unit/lib/redmine/unified_diff_test.rb'
-
Lint/AmbiguousBlockAssociation:
Enabled: false