diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-04-06 14:16:51 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-04-06 14:16:51 +0300 |
| commit | 30bca22d0841bfb2fdb6f5dc5970a4486614de4c (patch) | |
| tree | 87dd0319a34894e3be161498e981bfe4f4b08251 /changelogs | |
| parent | ca330f7ea30b368b928f5468a1f53264d74aa8aa (diff) | |
Fix 500 error when MR from fork has conflicts but worker has not run
If the ref hasn't been fetched into the target repository yet, this will fail
with a Rugged::ReferencError (assuming we're not using Gitaly). We should handle
this in the same way as a missing ref.
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/fix-500-error-when-mr-ref-is-not-yet-fetched.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-500-error-when-mr-ref-is-not-yet-fetched.yml b/changelogs/unreleased/fix-500-error-when-mr-ref-is-not-yet-fetched.yml new file mode 100644 index 00000000000..e21554f091a --- /dev/null +++ b/changelogs/unreleased/fix-500-error-when-mr-ref-is-not-yet-fetched.yml @@ -0,0 +1,6 @@ +--- +title: Fix 500 error when a merge request from a fork has conflicts and has not yet + been updated +merge_request: +author: +type: fixed |