diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-18 10:20:00 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-18 10:20:00 +0000 |
commit | 9b9cf3bcedef492b6faf0425a9697afb03d093aa (patch) | |
tree | adc11924181b9fb9f8a541798f95338f34a9f2af | |
parent | 3b303febd0eb6f5a311cfa44222c87d06054ebc2 (diff) | |
parent | b982caf115e1258a87f04c9f40f3d502efc55cf4 (diff) | |
download | gitlab-ce-9b9cf3bcedef492b6faf0425a9697afb03d093aa.tar.gz |
Merge branch 'remove-duplicate-changelog-entry' into 'master'
Remove duplicate entry in the changelog
/cc @DouweM
See merge request !2149
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 53aa970d45c..4fb867c969b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,7 +5,6 @@ v 8.3.0 (unreleased) - Add open_issues_count to project API (Stan Hu) - Expand character set of usernames created by Omniauth (Corey Hinshaw) - Add button to automatically merge a merge request when the build succeeds (Zeger-Jan van de Weg) - - Merge when build succeeds (Zeger-Jan van de Weg) - Provide better diagnostic message upon project creation errors (Stan Hu) - Bump devise to 3.5.3 to fix reset token expiring after account creation (Stan Hu) - Bump gollum-lib to 4.1.0 (Stan Hu) |