summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-12-07 20:35:39 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-12-07 20:35:39 +0000
commit7838317a14ddb686a16e914f9dbfb393a6bf5099 (patch)
treecdf70f6f056cff84ba9490c9399673ccdf3cb56f /changelogs
parentaf4d4e7067525e02eb2c17d2d0c524621c8ed345 (diff)
parentb7a5125f02865637ffbd4d7f8a623c994b861f0e (diff)
downloadgitlab-ce-7838317a14ddb686a16e914f9dbfb393a6bf5099.tar.gz
Merge branch 'fix_39233' into 'master'
fix #39233 - 500 in merge request Closes #39233 See merge request gitlab-org/gitlab-ce!15774
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/15774-fix-39233-500-in-merge-request.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/15774-fix-39233-500-in-merge-request.yml b/changelogs/unreleased/15774-fix-39233-500-in-merge-request.yml
new file mode 100644
index 00000000000..1179b3f20e6
--- /dev/null
+++ b/changelogs/unreleased/15774-fix-39233-500-in-merge-request.yml
@@ -0,0 +1,5 @@
+---
+title: 'fix #39233 - 500 in merge request'
+merge_request: 15774
+author: Martin Nowak
+type: fixed