diff options
| author | John Jarvis <jarv@gitlab.com> | 2018-12-27 17:49:34 +0300 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2018-12-27 17:49:34 +0300 |
| commit | a8c4f7f121b85f3e755c8b65f14fe188b9dc5a03 (patch) | |
| tree | 79a619241db7f009e1f2c922d94be9e26d6182ab /changelogs | |
| parent | 6154ac9a841cff70ab9cf66adbf7543466b9e6cb (diff) | |
| parent | 943bc6705b7a58fc57c2bf03c22c69ef19252197 (diff) | |
Merge branch 'security-11-6' of dev.gitlab.org:gitlab/gitlabhq into 11-6-stable
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/fix-security-group-user-removal.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/security-48259-private-snippet.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/security-import-symlink.yml | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-security-group-user-removal.yml b/changelogs/unreleased/fix-security-group-user-removal.yml new file mode 100644 index 00000000000..09d09a96f84 --- /dev/null +++ b/changelogs/unreleased/fix-security-group-user-removal.yml @@ -0,0 +1,5 @@ +--- +title: Add subresources removal to member destroy service +merge_request: +author: +type: security diff --git a/changelogs/unreleased/security-48259-private-snippet.yml b/changelogs/unreleased/security-48259-private-snippet.yml new file mode 100644 index 00000000000..6cf1e5dc694 --- /dev/null +++ b/changelogs/unreleased/security-48259-private-snippet.yml @@ -0,0 +1,5 @@ +--- +title: Prevent private snippets from being embeddable +merge_request: +author: +type: security 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 |