summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim <tgaudette88@gmail.com>2016-06-29 06:05:08 -0400
committerTim <tgaudette88@gmail.com>2016-06-29 06:05:08 -0400
commitfb54939f6e7db084d1a885884afc2b61de0e560b (patch)
tree9d244c49cb96c111139e24f3cc1b315981cd8f84
parent65a9d897361c510a42ae6e5d6f67e4a00ebe9015 (diff)
downloadgitlab-ce-fb54939f6e7db084d1a885884afc2b61de0e560b.tar.gz
Moved CHANGELOG entry up to help avoid future conflicts
rebased with latest changes from master
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 7c653f091d3..4537b02c5fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ v 8.10.0 (unreleased)
- Check for conflicts with existing Project's wiki path when creating a new project.
- Remove unused front-end variable -> default_issues_tracker
- Add API endpoint for a group issues !4520 (mahcsig)
+ - Add Bugzilla integration !4930 (iamtjg)
- Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w)
- Add basic system information like memory and disk usage to the admin panel
@@ -26,7 +27,6 @@ v 8.9.3 (unreleased)
- Fix encrypted data backwards compatibility after upgrading attr_encrypted gem
- Update mobile button icons to be more inline with typical UI paradigms
- Fixes missing avatar on system notes. !4954
- - Add Bugzilla integration !4930 (iamtjg)
v 8.9.2
- Fix visibility of snippets when searching.