diff options
| author | Luke Duncalfe <lduncalfe@eml.cc> | 2019-04-19 05:50:39 +0300 |
|---|---|---|
| committer | Luke Duncalfe <lduncalfe@eml.cc> | 2019-04-19 05:50:39 +0300 |
| commit | 9710f5e8ba41662945b7e83799da489fa5ca32cb (patch) | |
| tree | 74dafea7c4b18830d98ba6cc29e308f5740dee09 /locale/pa_IN | |
| parent | 8c10e99de29f3c6f0d17ebde5af14324956dc109 (diff) | |
Rollback mutation of merge request on failed merge60720-wrap-merge-in-transaction
The second call to the Gitaly UserMergeBranch RPC method can raise an
exception. Previously, if this were to happen, the merge request's
`in_progress_merge_commit_sha` attribute would be set to a commit SHA
that didn't exist.
`Repository#merge` now uses a transaction block in order to rollback
the setting of this attribute if any error occurs.
https://gitlab.com/gitlab-org/gitlab-ce/issues/60720
Diffstat (limited to 'locale/pa_IN')
0 files changed, 0 insertions, 0 deletions