summaryrefslogtreecommitdiff
path: root/changelogs/unreleased/sh-fix-issue-49133.yml
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2018-07-16 16:55:06 +0000
committerAlessio Caiazza <acaiazza@gitlab.com>2018-07-17 11:10:14 +0200
commit224b7185d078b4102864f9e7c7d8ddbed18e4ccc (patch)
tree867c1b842bf8d7e3a4d909d45e00fb96b3f0cbea /changelogs/unreleased/sh-fix-issue-49133.yml
parented84ff17692cd6b14399ca5efc9bf3ab3c9358de (diff)
downloadgitlab-ce-224b7185d078b4102864f9e7c7d8ddbed18e4ccc.tar.gz
Merge branch 'sh-fix-issue-49133-10-8-stable-port' into 'security-10-8'
Fix symlink vulnerability in project import (10.8 port) See merge request gitlab/gitlabhq!2438
Diffstat (limited to 'changelogs/unreleased/sh-fix-issue-49133.yml')
-rw-r--r--changelogs/unreleased/sh-fix-issue-49133.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-issue-49133.yml b/changelogs/unreleased/sh-fix-issue-49133.yml
new file mode 100644
index 00000000000..ef7d199d52e
--- /dev/null
+++ b/changelogs/unreleased/sh-fix-issue-49133.yml
@@ -0,0 +1,5 @@
+---
+title: Merge branch 'fix-mr-widget-border' into 'master'
+merge_request:
+author:
+type: security