diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-04-28 17:22:35 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-05-16 14:56:32 -0300 |
| commit | 0baadd6cff63d5ac0048043381a0b7daff6e01c3 (patch) | |
| tree | aa22e3242952761e216b55c3ce860ff5c8609681 | |
| parent | c5526a2d9a946d99d7b4a72fc488fe6e0a9ad60b (diff) | |
| download | gitlab-ce-0baadd6cff63d5ac0048043381a0b7daff6e01c3.tar.gz | |
Fix changelog file
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 1 |
2 files changed, 0 insertions, 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 |