diff options
| author | Dominik Sander <git@dsander.de> | 2015-04-03 16:46:23 +0200 |
|---|---|---|
| committer | Dominik Sander <git@dsander.de> | 2015-04-15 18:23:57 +0200 |
| commit | d4fec49abc0fceec11f970c0699dfe71ee185290 (patch) | |
| tree | ce687bb7745e08199f4592640e05c0b56d33de1b /CHANGELOG | |
| parent | 5f78601c8a67028f246134d325cca99952ba78b6 (diff) | |
| download | gitlab-ce-d4fec49abc0fceec11f970c0699dfe71ee185290.tar.gz | |
Fix merge request comments on files with multiple commits
Having a merge request with a comments on a line which is then changed
in a later commit prevented new comments from properly showing up in the
merge request show page.
* `Note#set_diff` do not use stored the diff when creating a new note
in merge requests (we can not be sure the diff did not changed since
the last comment on that line)
* Do not rely just on `outdated?` of the first note when displaying
comments of a MR in the discussion tab, but partition the
active/outdated notes and display them all
* In the inline changes tab just select the active notes, so an
outdated note does not prevent an active one from being rendered
* Just show active comments in the side-by-side changes tab
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index e8f367c332b..0487cc64745 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -88,6 +88,7 @@ v 7.10.0 (unreleased) - Allow user to choose a public email to show on public profile - Remove truncation from issue titles on milestone page (Jason Blanchard) - Fix stuck Merge Request merging events from old installations (Ben Bodenmiller) + - Fix merge request comments on files with multiple commits v 7.9.3 - Contains no changes |