summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-21 09:31:59 +0000
committerDouwe Maan <douwe@gitlab.com>2015-05-21 09:31:59 +0000
commit7298d05cc08b2cc2dc6453fc45d59d07de042869 (patch)
tree7e3e337258ea9282388a1ac899ad023684092330 /CHANGELOG
parent3a3f4b41e67485e62b2e37cc395f3407b30a7d9e (diff)
parentcbcc5f854400f8e22c2164d6265fb863279c9622 (diff)
downloadgitlab-ce-7298d05cc08b2cc2dc6453fc45d59d07de042869.tar.gz
Merge branch 'rs-issue-1568' into 'master'
Work around a Chrome 43 bug preventing note editing Fixes #1568 - and I mean "fixes" I have no idea what causes this or why this fixes it and can't dig into it further right now, but the bug seems like a blocker so this needs to be fixed for 7.11. See merge request !684
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3829cdb5237..d8474968179 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 7.12.0 (unreleased)
v 7.11.0 (unreleased)
- Fall back to Plaintext when Syntaxhighlighting doesn't work. Fixes some buggy lexers (Hannes Rosenögger)
+ - Get editing comments to work in Chrome 43 again.
- 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)