Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-24 18:10:22 +0300
committerFilipa Lacerda <filipa@gitlab.com>2018-04-03 17:05:53 +0300
commit1a8d6f6f38c1d8d9b977e658105091eddc5ec67e (patch)
treeeaeea334d975a097a139bf27154a9de631c37b23 /app/views
parent3760b3f13ea9bea18a5e74ad4fa743221288ceb6 (diff)
Merge branch 'jej/mattermost-notification-confidentiality' into 'security-10-4'
Prevent notes on confidential issues from being sent to chat See merge request gitlab/gitlabhq!2248
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/web_hooks/_form.html.haml7
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 1f0e7629fb4..3dba9c099c4 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