summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorMartin Nowak <code@dawg.eu>2017-12-06 19:10:53 +0100
committerMartin Nowak <code@dawg.eu>2017-12-07 20:19:37 +0100
commitb7a5125f02865637ffbd4d7f8a623c994b861f0e (patch)
treebaba27d1d0e839931f3b995fd6acd2dafe7c4f50 /changelogs
parentf1a98477014ceee1738a6994da9fd17dd4ccea00 (diff)
downloadgitlab-ce-b7a5125f02865637ffbd4d7f8a623c994b861f0e.tar.gz
fix #39233 - 500 in merge request
- handle unchanged empty lines in inline diff
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