summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-14 17:47:23 +0000
committerDouwe Maan <douwe@gitlab.com>2015-05-14 17:47:23 +0000
commit37bc4bb19934c4a0eb84fd5e2556363f55d4d601 (patch)
treedd6357b920d4a48693720da8bfb6a0fc066f091e /CHANGELOG
parent8dde52cc099af63e1bdc02ca6fc389e4a9ea9969 (diff)
parent28797d3adccea0c2b203bf8d227dd20accdab231 (diff)
downloadgitlab-ce-37bc4bb19934c4a0eb84fd5e2556363f55d4d601.tar.gz
Merge branch 'fix-blob-path' into 'master'
Fix broken view when viewing history of a file that includes a path that used to be another file Requires gitlab_git to v7.1.12 to be tagged and released. Closes #1598 See merge request !651
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index dd69d73d86f..5b0934fb0cd 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.11.0 (unreleased)
+ - Fix broken view when viewing history of a file that includes a path that used to be another file (Stan Hu)
- Don't show duplicate deploy keys
- Fix commit time being displayed in the wrong timezone in some cases (Hannes Rosenögger)
- Make the first branch pushed to an empty repository the default HEAD (Stan Hu)