summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-09-16 14:42:49 +0200
committerDouwe Maan <douwe@gitlab.com>2015-09-16 14:42:49 +0200
commit624a2cf27c719dbb384ec9251120f62c0a04fdc4 (patch)
treec67851357e8344a386f820a816b936ca96f2c65d /CHANGELOG
parent7bb22831a13b021c7b2d1cc8542808243a659d38 (diff)
parentcccd269da3f5d82c5d14289980d9b52c9cad08db (diff)
downloadgitlab-ce-624a2cf27c719dbb384ec9251120f62c0a04fdc4.tar.gz
Merge branch 'master' into update-mailroom
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index eb4c59d6205..71238630d31 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 8.0.0 (unreleased)
+ - Fix broken sort in merge request API (Stan Hu)
- Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs (Stan Hu)
- Gracefully handle errors in syntax highlighting by leaving the block unformatted (Stan Hu)
- Add "replace" and "upload" functionalities to allow user replace existing file and upload new file into current repository