diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-04-03 14:00:33 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2018-04-05 09:41:56 +0300 |
commit | 52967b107b7b2f1472b4c005f70f21346079cd95 (patch) | |
tree | 12e99d4fe27f69af53920bd4db3a81e473def642 /changelogs/unreleased/jej-mattermost-notification-confidentiality.yml | |
parent | 98106ec54e439455f545f3df15332a28b9b0c969 (diff) |
Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'security-10-6'
[10.6] Prevent notes on confidential issues from being sent to chat
See merge request gitlab/gitlabhq!2366
# Conflicts:
# app/helpers/services_helper.rb
Diffstat (limited to 'changelogs/unreleased/jej-mattermost-notification-confidentiality.yml')
-rw-r--r-- | changelogs/unreleased/jej-mattermost-notification-confidentiality.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/jej-mattermost-notification-confidentiality.yml b/changelogs/unreleased/jej-mattermost-notification-confidentiality.yml new file mode 100644 index 00000000000..d5219b5d019 --- /dev/null +++ b/changelogs/unreleased/jej-mattermost-notification-confidentiality.yml @@ -0,0 +1,5 @@ +--- +title: Adds confidential notes channel for Slack/Mattermost +merge_request: +author: +type: security |