summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-09-28 11:11:10 +0100
committerSean McGivern <sean@gitlab.com>2017-09-28 11:11:10 +0100
commitb63e8d64c1a2d39a7e18f22b526e48bab2c79956 (patch)
treed83eb0d2fba53327b2ebbb3a6e5e1663ad30551a /changelogs
parente03bad12bf579a83a814c07399ef9bdc37e2f120 (diff)
downloadgitlab-ce-b63e8d64c1a2d39a7e18f22b526e48bab2c79956.tar.gz
Handle error when fetching ref for MR with deleted source branch38319-nomethoderror-undefined-method-sha-for-nil-nilclass
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.
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/38319-nomethoderror-undefined-method-sha-for-nil-nilclass.yml5
1 files changed, 5 insertions, 0 deletions
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