diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-01-27 17:23:59 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-01-27 17:23:59 +0100 |
| commit | 5cce1278adb168cd9fa4f189e3656a59726b4e6c (patch) | |
| tree | 61e78e71ef377095abf6e3df3bee5a027ce5989a /CHANGELOG | |
| parent | a93f7099fa2ed98746ebfb5e55322d0afb5068f8 (diff) | |
| download | gitlab-ce-5cce1278adb168cd9fa4f189e3656a59726b4e6c.tar.gz | |
Correctly determine MR diff base when MR has merge conflicts
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4b283f235a4..e7273e017ea 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,8 +20,7 @@ v 8.4.2 (unreleased) improvement when checking if a repository was empty - Add instrumentation for Gitlab::Git::Repository instance methods so we can track them in Performance Monitoring. - -v 8.4.2 (unreleased) + - Correctly highlight MR diff when MR has merge conflicts - Fix method undefined when using external commit status in builds v 8.4.1 |