diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-01-28 21:08:41 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-01-28 21:08:41 +0000 |
| commit | 2b1ddb0f807b328aae00b1d9b0fb7f62e8adbe59 (patch) | |
| tree | ebc6a96333ca6447b571f36eff9d34ea5797b0ee /CHANGELOG | |
| parent | 0e79b5f3967928a576d68d34c0acc1e2aba6c02a (diff) | |
| parent | b7ec476205173b9ca1780843ceb4617fdde0b9d7 (diff) | |
| download | gitlab-ce-2b1ddb0f807b328aae00b1d9b0fb7f62e8adbe59.tar.gz | |
Merge branch 'mr-merge-base' into 'master'
Correctly determine MR diff base when MR has merge conflicts
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779
See merge request !2632
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 322765c6d08..fe0504ec996 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -27,6 +27,7 @@ v 8.4.2 improvement when checking if a repository was empty - Add instrumentation for Gitlab::Git::Repository instance methods so we can track them in Performance Monitoring. + - Correctly highlight MR diff when MR has merge conflicts - Increase contrast between highlighted code comments and inline diff marker - Fix method undefined when using external commit status in builds - Fix highlighting in blame view. |