From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 20 Nov 2019 17:05:35 +0000 (+0000)
Subject: rubocop: use "EnforcedStyle: empty" for Style/EmptyElse
X-Git-Tag: 4.2.0~1531
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8db904c4011d335676b1d0a2c2b89a0d111c2b05;p=redmine.git

rubocop: use "EnforcedStyle: empty" for Style/EmptyElse

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

diff --git a/.rubocop.yml b/.rubocop.yml
index 6394a8fe0..5786dfc09 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -80,6 +80,9 @@ Style/AsciiComments:
     # We can not change nor remove it.
     - 'app/models/repository/git.rb'
 
+Style/EmptyElse:
+  EnforcedStyle: empty
+
 Style/FormatStringToken:
   Enabled: false
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index badd847f3..5f2dfc681 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1054,10 +1054,7 @@ Style/EmptyCaseCondition:
 # SupportedStyles: empty, nil, both
 Style/EmptyElse:
   Exclude:
-    - 'app/helpers/avatars_helper.rb'
-    - 'app/models/import.rb'
     - 'app/models/mail_handler.rb'
-    - 'app/models/query.rb'
 
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.