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 /app | |
| 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 'app')
| -rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 1c02e68f2f6..f540b00a849 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -1050,7 +1050,7 @@ class Repository # To support the full deprecated behaviour, set the # `rebase_commit_sha` for the merge_request here and return the value - merge_request.update(rebase_commit_sha: rebase_sha) + merge_request.update(rebase_commit_sha: rebase_sha, merge_error: nil) rebase_sha end @@ -1069,7 +1069,7 @@ class Repository remote_repository: merge_request.target_project.repository.raw, remote_branch: merge_request.target_branch ) do |commit_id| - merge_request.update!(rebase_commit_sha: commit_id) + merge_request.update!(rebase_commit_sha: commit_id, merge_error: nil) end end end |