summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-05 17:23:32 +0200
committerRémy Coutable <remy@rymai.me>2016-09-05 17:23:32 +0200
commit8aa025bb85cab3070a876b43d9c5462af5f35e67 (patch)
treeee0a11ec654dcf337b6badad796068f0bd54085e /app/views/projects
parent89af76edc5e44ad1a0a55a65337bb992355911a6 (diff)
parenta24822104a1b27560c8d3c76462ef778144f9491 (diff)
downloadgitlab-ce-8aa025bb85cab3070a876b43d9c5462af5f35e67.tar.gz
Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/hooks/_project_hook.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/hooks/_project_hook.html.haml b/app/views/projects/hooks/_project_hook.html.haml
index 3fcf1692e09..ceabe2eab3d 100644
--- a/app/views/projects/hooks/_project_hook.html.haml
+++ b/app/views/projects/hooks/_project_hook.html.haml
@@ -3,7 +3,7 @@
.col-md-8.col-lg-7
%strong.light-header= hook.url
%div
- - %w(push_events tag_push_events issues_events note_events merge_requests_events build_events pipeline_events wiki_page_events).each do |trigger|
+ - %w(push_events tag_push_events issues_events confidential_issues_events note_events merge_requests_events build_events pipeline_events wiki_page_events).each do |trigger|
- if hook.send(trigger)
%span.label.label-gray.deploy-project-label= trigger.titleize
.col-md-4.col-lg-5.text-right-lg.prepend-top-5