diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-30 18:05:54 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-01 15:30:58 +0200 |
| commit | bb937e7ab7cfcc3d816ccf4d34b67b342882bece (patch) | |
| tree | c80597b20e16a4a18a31ec5194229a2da57ad848 /CHANGELOG | |
| parent | c004ed5f73e7680c70f520f2f920987348ee0c9a (diff) | |
| download | gitlab-ce-bb937e7ab7cfcc3d816ccf4d34b67b342882bece.tar.gz | |
Merge branch 'reject-merge-conflicts' into 'master'
Properly abort a merge when merge conflicts occur
If somehow a user attempted to accept a merge request that had conflicts (e.g. the "Accept Merge Request" button or the MR itself was not updated), `MergeService` did not properly detect that a conflict
occurred. It would assume that the MR went through without any issues and close the MR as though everything was fine. This could cause data loss if the source branch were removed.
Closes #20425
See merge request !5569
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index ccd454ddf3c..3f4a504630b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ v 8.10.3 (unreleased) - Fix timing problems running imports on production. !5523 - Add a log message when a project is scheduled for destruction for debugging. !5540 - Fix hooks missing on imported GitLab projects. !5549 + - Properly abort a merge when merge conflicts occur. !5569 v 8.10.2 - User can now search branches by name. !5144 |