diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-21 05:06:39 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-21 05:06:39 +0300 |
commit | a224a655d812d60fa8be45e36922049b313ecb2f (patch) | |
tree | 62ce86cdaca646f9d51b715da6dd4fb429d8e672 /CHANGELOG | |
parent | 5484acd99878a70e95bd5e1f22900b2fd6c612c1 (diff) | |
parent | 0632e85c82eeb76c9b61e497655c9cf2ef5dc262 (diff) |
Merge branch 'mr-commit-comment-diff-lines' into 'master'
Fix commit comments on first line of diff not rendering in Merge Request Discussion view.
Example can be seen near the bottom on this MR: !1533.
Before:
![Screen Shot 2015-02-20 at 10.24.34](https://dev.gitlab.org/uploads/gitlab/gitlabhq/35600b98b5/Screen_Shot_2015-02-20_at_10.24.34.png)
After: the [note](https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1533/diffs#note_36449) is actually rendered.
See merge request !1552
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4dfa01f6cb5..c4b5a847e12 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ v 7.9.0 (unreleased) - Move labels/milestones tabs to sidebar - Improve UI for commits, issues and merge request lists + - Fix commit comments on first line of diff not rendering in Merge Request Discussion view. v 7.8.0 (unreleased) - Fix access control and protection against XSS for note attachments and other uploads. |