summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-08-30 08:41:49 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-08-30 08:41:49 +0000
commit8479b3b6fc051c3bd31330403e202ec5c09808f0 (patch)
tree106e68cc2cbafb509bcf6b0b206008fcb8655dda /changelogs
parentf981d4febbbb5103262f4daa858236d9c4ed9d67 (diff)
parentfda12a61d35935ee852349ffa152fbcc724c14ae (diff)
downloadgitlab-ce-8479b3b6fc051c3bd31330403e202ec5c09808f0.tar.gz
Merge branch 'sh-fix-error-500-updating-wikis' into 'master'
Fix Error 500s due to encoding issues when Wiki hooks fire Closes #50590 See merge request gitlab-org/gitlab-ce!21414
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/sh-fix-error-500-updating-wikis.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-error-500-updating-wikis.yml b/changelogs/unreleased/sh-fix-error-500-updating-wikis.yml
new file mode 100644
index 00000000000..d80d4952ba5
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-error-500-updating-wikis.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Error 500s due to encoding issues when Wiki hooks fire
+merge_request: 21414
+author:
+type: fixed