diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-05-16 11:59:56 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-05-16 11:59:56 +0300 |
| commit | c841c8771b8d69034c1ceb6e452746d193865cb0 (patch) | |
| tree | 530feb483facad799e5744c950a3c3deb1300c94 /spec/support/helpers | |
| parent | fbdfc05b9e01f5511ec9723bbbb4a558962bb3ed (diff) | |
| parent | 5632079c3684562aea890123182bd43648149b55 (diff) | |
Merge branch 'sh-fix-rebase-error-clearing' into 'master'
Properly clear the merge error upon rebase failure
Closes #56139
See merge request gitlab-org/gitlab-ce!28319
Diffstat (limited to 'spec/support/helpers')
0 files changed, 0 insertions, 0 deletions