rubocop: use AllowAdjacentOneLineDefs of Layout/EmptyLineBetweenDefs

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

.rubocop.yml

@@ -22,6 +22,9 @@ require:
 
 # Rules for Redmine
 
+Layout/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
 Layout/SpaceBeforeBlockBraces:
   Enabled: false
 

.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'