summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-03-15 11:34:26 +0000
committerNick Thomas <nick@gitlab.com>2019-03-15 11:34:26 +0000
commita885e2d0a63b25411995fce2057067348f1bad9b (patch)
tree31d93f17243c74dd229c0a76d0a58dc23e99e4ad /changelogs
parent7fa987436bab5fe9a9c3581efa74b23f41bf53c8 (diff)
parent6552197eecfd355041ecb99f48a48efb93c5ffab (diff)
downloadgitlab-ce-a885e2d0a63b25411995fce2057067348f1bad9b.tar.gz
Merge branch 'sh-handle-null-bytes-in-merge-request-diffs' into 'master'
Fix error creating a merge request when diff includes a null byte Closes #57710 See merge request gitlab-org/gitlab-ce!26190
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-handle-null-bytes-in-merge-request-diffs.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-handle-null-bytes-in-merge-request-diffs.yml b/changelogs/unreleased/sh-handle-null-bytes-in-merge-request-diffs.yml
new file mode 100644
index 00000000000..01b6b08b61b
--- /dev/null
+++ b/changelogs/unreleased/sh-handle-null-bytes-in-merge-request-diffs.yml
@@ -0,0 +1,5 @@
+---
+title: Fix error creating a merge request when diff includes a null byte
+merge_request: 26190
+author:
+type: fixed