summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorJohn Jarvis <jarv@gitlab.com>2018-12-20 12:37:55 +0000
committerJohn Jarvis <jarv@gitlab.com>2018-12-20 12:37:55 +0000
commit6aeaa1bd5acb597f606f086793fafbd554505123 (patch)
tree4357f1b1169dc63015dbd4b34a678d06e0d50427 /changelogs
parentca019bf3b85e2e2557a21827038b7340844b74ec (diff)
parent7f196d53a8369af3cd6149ff57585de681c3216f (diff)
downloadgitlab-ce-6aeaa1bd5acb597f606f086793fafbd554505123.tar.gz
Merge branch 'security-import-symlink-11-5' into 'security-11-5'
[11.5] Persistent Symlink in Project Import See merge request gitlab/gitlabhq!2729
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/security-import-symlink.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/security-import-symlink.yml b/changelogs/unreleased/security-import-symlink.yml
new file mode 100644
index 00000000000..fe1b6eccf9e
--- /dev/null
+++ b/changelogs/unreleased/security-import-symlink.yml
@@ -0,0 +1,5 @@
+---
+title: Fix persistent symlink in project import
+merge_request:
+author:
+type: security