From b63e8d64c1a2d39a7e18f22b526e48bab2c79956 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Thu, 28 Sep 2017 11:11:10 +0100 Subject: Handle error when fetching ref for MR with deleted source branch If the ref doesn't exist, and the source branch is deleted, we can't get it back easily. Previously, we ignored this error by shelling out, so replicate that behaviour. --- .../38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml (limited to 'changelogs') diff --git a/changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml b/changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml new file mode 100644 index 00000000000..f3c39827590 --- /dev/null +++ b/changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml @@ -0,0 +1,5 @@ +--- +title: Fix 500 error on merged merge requests when GitLab is restored from a backup +merge_request: +author: +type: fixed -- cgit v1.2.1