From 0baadd6cff63d5ac0048043381a0b7daff6e01c3 Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Thu, 28 Apr 2016 17:22:35 -0300
Subject: [PATCH] Fix changelog file

---
 CHANGELOG          | 2 --
 app/models/user.rb | 1 -
 2 files changed, 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5841da3ac99..7ebe10c0f7b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -95,8 +95,6 @@ v 8.7.1
 v 8.7.0
   - Gitlab::GitAccess and Gitlab::GitAccessWiki are now instrumented
   - Fix vulnerability that made it possible to gain access to private labels and milestones
-
-v 8.7.0 (unreleased)
   - The number of InfluxDB points stored per UDP packet can now be configured
   - Fix error when cross-project label reference used with non-existent project
   - Transactions for /internal/allowed now have an "action" tag set
diff --git a/app/models/user.rb b/app/models/user.rb
index bcadbd3e2fb..368a3f3cfba 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -309,7 +309,6 @@ class User < ActiveRecord::Base
   end
 
   def check_confirmation_email
-    byebug
     skip_confirmation! unless current_application_settings.send_user_confirmation_email
   end