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'