From 17c8d15b14f6c3ecc98e1466e9148cf100cc12c6 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Fri, 10 Feb 2017 15:26:23 -0500
Subject: [PATCH] Enable `Lint/EmptyWhen` cop and correct offense
---
.rubocop.yml | 4 ++++
.rubocop_todo.yml | 4 ----
lib/gitlab/diff/parser.rb | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.rubocop.yml b/.rubocop.yml
index 1061de7c797..6e8f599bf25 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -572,6 +572,10 @@ Lint/ElseLayout:
Lint/EmptyEnsure:
Enabled: true
+# Checks for the presence of `when` branches without a body.
+Lint/EmptyWhen:
+ Enabled: true
+
# Align ends correctly.
Lint/EndAlignment:
Enabled: true
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7ef5523de4b..648b3fc49d2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -21,10 +21,6 @@ Lint/AmbiguousRegexpLiteral:
Lint/AssignmentInCondition:
Enabled: false
-# Offense count: 1
-Lint/EmptyWhen:
- Enabled: false
-
# Offense count: 20
Lint/HandleExceptions:
Enabled: false
diff --git a/lib/gitlab/diff/parser.rb b/lib/gitlab/diff/parser.rb
index 59a2367b65d..89320f5d9dc 100644
--- a/lib/gitlab/diff/parser.rb
+++ b/lib/gitlab/diff/parser.rb
@@ -45,7 +45,7 @@ module Gitlab
line_new += 1
when "-"
line_old += 1
- when "\\"
+ when "\\" # rubocop:disable Lint/EmptyWhen
# No increment
else
line_new += 1
--
GitLab