rubocop: use AllowAdjacentOneLineDefs of Layout/EmptyLineBetweenDefs

git-svn-id: http://svn.redmine.org/redmine/trunk@18672 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/.rubocop.yml b/.rubocop.yml
index 967b6f7e7e3c97d0527b651d3c5ff44724b4cb52..8fe639e80061f2e633e15b28d830c315598023e5 100644 (file)
--- 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 ff077387c95daf69f4eee139188a4901d774cc85..da2fda5221fcfb891612555b95e59918017c5123 100644 (file)
--- 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'