From 3d357bcd84cd9dbbad411d7d61123e278b158d35 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 3 Aug 2019 07:50:03 +0000
Subject: [PATCH] rubocop: use Layout/TrailingWhitespace AllowInHeredoc true

git-svn-id: http://svn.redmine.org/redmine/trunk@18342 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .rubocop.yml      | 3 +++
 .rubocop_todo.yml | 6 ------
 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