From 36e0d3273d86570b291283e7a277524ab3a37db5 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 14 Oct 2019 18:57:13 +0000
Subject: [PATCH] rubocop: use AllowAdjacentOneLineDefs of
 Layout/EmptyLineBetweenDefs

git-svn-id: http://svn.redmine.org/redmine/trunk@18672 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .rubocop.yml      | 3 +++
 .rubocop_todo.yml | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 967b6f7e7..8fe639e80 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -22,6 +22,9 @@ require:
 
 # Rules for Redmine
 
+Layout/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
 Layout/SpaceBeforeBlockBraces:
   Enabled: false
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ff077387c..da2fda522 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -127,12 +127,7 @@ Layout/EmptyLineAfterGuardClause:
 # Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines.
 Layout/EmptyLineBetweenDefs:
   Exclude:
-    - 'app/models/user.rb'
-    - 'app/models/user_preference.rb'
     - 'app/models/version.rb'
-    - 'lib/redmine/info.rb'
-    - 'lib/redmine/version.rb'
-    - 'test/helpers/sort_helper_test.rb'
     - 'test/unit/mailer_test.rb'
     - 'test/unit/project_test.rb'