diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-03 11:00:33 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-04-05 08:41:56 +0200 |
| commit | 52967b107b7b2f1472b4c005f70f21346079cd95 (patch) | |
| tree | 12e99d4fe27f69af53920bd4db3a81e473def642 /app/views/shared/web_hooks | |
| parent | 98106ec54e439455f545f3df15332a28b9b0c969 (diff) | |
| download | gitlab-ce-52967b107b7b2f1472b4c005f70f21346079cd95.tar.gz | |
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 'app/views/shared/web_hooks')
| -rw-r--r-- | app/views/shared/web_hooks/_form.html.haml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml index ad4d39b4aa1..d36ca032558 100644 --- a/app/views/shared/web_hooks/_form.html.haml +++ b/app/views/shared/web_hooks/_form.html.haml @@ -33,6 +33,13 @@ %p.light This URL will be triggered when someone adds a comment %li + = form.check_box :confidential_note_events, class: 'pull-left' + .prepend-left-20 + = form.label :confidential_note_events, class: 'list-label' do + %strong Confidential Comments + %p.light + This URL will be triggered when someone adds a comment on a confidential issue + %li = form.check_box :issues_events, class: 'pull-left' .prepend-left-20 = form.label :issues_events, class: 'list-label' do |