diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-14 14:37:15 -0500 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-15 21:34:59 -0700 |
| commit | 5632079c3684562aea890123182bd43648149b55 (patch) | |
| tree | 327406be44c1893447da6d486ac816a11b80b23a /changelogs | |
| parent | 3d2edaac04ec1e4d5074a43249c11cf6e8a8eecf (diff) | |
| download | gitlab-ce-5632079c3684562aea890123182bd43648149b55.tar.gz | |
Properly clear the merge error upon rebase failuresh-fix-rebase-error-clearing
If `merge_error` is ever set after a failure, it is never cleared, even
after a subsequent, successful rebase. We now clear this field whenever
a successful rebase occurs.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56139
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/sh-fix-rebase-error-clearing.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-rebase-error-clearing.yml b/changelogs/unreleased/sh-fix-rebase-error-clearing.yml new file mode 100644 index 00000000000..4f5f2779e7f --- /dev/null +++ b/changelogs/unreleased/sh-fix-rebase-error-clearing.yml @@ -0,0 +1,5 @@ +--- +title: Properly clear the merge error upon rebase failure +merge_request: 28319 +author: +type: fixed |