summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-26 08:56:00 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-26 08:56:00 -0700
commitb8164321fedfd17479ce7ac0b4961bf1e5929da0 (patch)
tree73031698255cc7665e4bf80d4252a9b21e526244 /CHANGELOG
parenta80733e25494a9b8d31b33454a9fb3f5b4be2dfb (diff)
parent7842a815693328614c77f636b3b413d260739fcf (diff)
downloadgitlab-ce-b8164321fedfd17479ce7ac0b4961bf1e5929da0.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3c3ebd894b5..5ae65205517 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 7.10.0 (unreleased)
+ - Fix broken side-by-side diff view on merge request page (Stan Hu)
- Allow HTML tags in Markdown input
- Fix code unfold not working on Compare commits page (Stan Hu)
- Include missing events and fix save functionality in admin service template settings form (Stan Hu)