diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-07-28 19:33:40 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-07-29 17:38:53 +0800 |
| commit | 751be82ee189cad83c59516881edfac51f1ce379 (patch) | |
| tree | 6a592efc8aa3f2994561857312f456d6becf43b3 /app | |
| parent | ae5f124e96504f20500df282d34dce7b0627c212 (diff) | |
| download | gitlab-ce-751be82ee189cad83c59516881edfac51f1ce379.tar.gz | |
Add views for pipeline events
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/hooks/_project_hook.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/web_hooks/_form.html.haml | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/views/projects/hooks/_project_hook.html.haml b/app/views/projects/hooks/_project_hook.html.haml index 8151187d499..3fcf1692e09 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 wiki_page_events).each do |trigger| + - %w(push_events tag_push_events 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 diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml index 2585ed9360b..106161d6515 100644 --- a/app/views/shared/web_hooks/_form.html.haml +++ b/app/views/shared/web_hooks/_form.html.haml @@ -66,6 +66,13 @@ %p.light This url will be triggered when the build status changes %li + = f.check_box :pipeline_events, class: 'pull-left' + .prepend-left-20 + = f.label :pipeline_events, class: 'list-label' do + %strong Pipeline events + %p.light + This url will be triggered when the pipeline status changes + %li = f.check_box :wiki_page_events, class: 'pull-left' .prepend-left-20 = f.label :wiki_page_events, class: 'list-label' do |