From 6f293870eb29141b55fa30e4247dd9903675647c Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 26 Oct 2019 12:53:48 +0000 Subject: [PATCH] rubocop: revert r18852 git-svn-id: http://svn.redmine.org/redmine/trunk@18867 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop.yml | 6 ++++-- .rubocop_todo.yml | 7 ------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 9c1be3f87..358474c96 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -33,9 +33,11 @@ Layout/AlignArguments: Layout/EmptyLineBetweenDefs: AllowAdjacentOneLineDefs: true -# You can see results by "rubocop --only Layout/SpaceBeforeBlockBraces" Layout/SpaceBeforeBlockBraces: - EnforcedStyle: space + # "space" is used more than "no_space". + # But "no_space" is more natural in one liner. + # str = path.to_s.split(%r{[/\\]}).select{|p| !p.blank?}.join("/") + Enabled: false # You can see results by "rubocop --only Layout/SpaceInsideBlockBraces" Layout/SpaceInsideBlockBraces: diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 68241975b..220506289 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -266,13 +266,6 @@ Layout/SpaceAroundEqualsInParameterDefault: Layout/SpaceAroundOperators: Enabled: false -# Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle. -# SupportedStyles: space, no_space -# SupportedStylesForEmptyBraces: space, no_space -Layout/SpaceBeforeBlockBraces: - EnforcedStyleForEmptyBraces: no_space - # Cop supports --auto-correct. Layout/SpaceBeforeComma: Exclude: