summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-07-11 18:09:19 +0200
committerJames Lopez <james@jameslopez.es>2016-07-11 18:09:19 +0200
commit95fe316f5d5cad06ed3457dd6c6f8263dfabd058 (patch)
tree18e21a3592d1441fb783f5d89c9600ddabe5c82d
parentfeecb4afde4cde116bcdca9c9c5059cf201720f8 (diff)
downloadgitlab-ce-fix/import-event-error.tar.gz
fix changelog...fix/import-event-error
-rw-r--r--CHANGELOG8
1 files changed, 3 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ce17040614e..eaa0ae2de0c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -53,8 +53,6 @@ v 8.10.0 (unreleased)
- Memoize MR merged/closed events retrieval
- Don't render discussion notes when requesting diff tab through AJAX
- Add basic system information like memory and disk usage to the admin panel
-
-v 8.9.5 (unreleased)
- Don't garbage collect commits that have related DB records like comments
- More descriptive message for git hooks and file locks
- Handle custom Git hook result in GitLab UI
@@ -63,12 +61,12 @@ v 8.9.5 (unreleased)
- Add date when user joined the team on the member page
- Fix 404 redirect after validation fails importing a GitLab project
- Added setting to set new users by default as external !4545 (Dravere)
-
-v 8.9.6
- - Fix importing of events under notes for GitLab projects
- Add min value for project limit field on user's form !3622 (jastkand)
- Add reminder to not paste private SSH keys !4399 (Ingo Blechschmidt)
+v 8.9.6 (unreleased)
+ - Fix importing of events under notes for GitLab projects
+
v 8.9.5
- Add more debug info to import/export and memory killer. !5108
- Fixed avatar alignment in new MR view. !5095