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 6394a8fe0f8b9f580aa2c9388aaae22cd0d0e291..5786dfc0956bae14123483089a898d83b375de3c 100644 (file)
--- 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 badd847f320b60c4371e4d450258da04885733bb..5f2dfc681df8358fe726feef985f9a028b965c80 100644 (file)
--- 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.