diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-11-09 14:12:42 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-11-09 14:12:42 +0300 |
| commit | 03b12ee5502e56b3cc9b14dfa92722f52ce41bce (patch) | |
| tree | cc43d516cf4999d63011c5a4be501cb2e82cbf51 /CHANGELOG | |
| parent | 9f055126479000764b488cbb8e91733daaca1c36 (diff) | |
| parent | 8f2561b193ad39f116655af0789798b45ad906c8 (diff) | |
Merge branch 'fix-commits-manual-merge' into 'master'
Fix bug where manually merged branches in a MR would end up with an empty diff
This bug manifested in 8.1 with the refactoring of `RefreshService`. Here's what happens:
1. User create a new branch `foo`.
2. User creates a merge request for `foo`.
3. User merges `foo` into `master` by hand.
4. `RefreshService` reloads the merge request. Since `master` is equivalent to `foo`, this results in an empty diff.
5. `RefreshService` then closes the MR.
This wasn't an issue when you use the normal "Accept Merge Request" flow because the act of clicking the button closes the merge request, so step 4 never happens.
Closes #3314
See merge request !1758
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 22012211164..19f288d0c7e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.2.0 (unreleased) + - Fix bug where manually merged branches in a MR would end up with an empty diff (Stan Hu) - Force update refs/merge-requests/X/head upon a push to the source branch of a merge request (Stan Hu) - Improved performance of finding users by one of their Email addresses - Improved performance of replacing references in comments |