summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-04-06 16:38:41 +0000
committerRémy Coutable <remy@rymai.me>2018-04-06 16:38:41 +0000
commit9e8f3058af2bd5a80dbff7f84d8c192895cee7d0 (patch)
tree1a0cb6f61a51aa2fd8476da4b06d5f5c9e5cd60f /changelogs
parentb81c6f142c38c9005b56ee5cf3677dac1b1adca8 (diff)
parent30bca22d0841bfb2fdb6f5dc5970a4486614de4c (diff)
downloadgitlab-ce-9e8f3058af2bd5a80dbff7f84d8c192895cee7d0.tar.gz
Merge branch 'fix-500-error-when-mr-ref-is-not-yet-fetched' into 'master'
Fix 500 error when MR from fork has conflicts but worker has not run See merge request gitlab-org/gitlab-ce!18226
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fix-500-error-when-mr-ref-is-not-yet-fetched.yml6
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