diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-31 08:34:38 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-31 08:34:38 +0000 |
| commit | ba81c91255aac2d724ceb94e3eb91f912227e2eb (patch) | |
| tree | 8045e173d7cd2d1c383bb0cb48bf82352ca5dc1b /app | |
| parent | 9951243bf4450b0282936dd1093cd87bc678f619 (diff) | |
| parent | ab17e4b74f0c607c4ddd4c160e2848819170551c (diff) | |
| download | gitlab-ce-ba81c91255aac2d724ceb94e3eb91f912227e2eb.tar.gz | |
Merge branch 'patch/wiki_page_events' into 'master'
Enable Wiki Page events from Webhook admin UI in a Project
* Added UI to enable page wiki events
* Documentation for this event in Webhooks page
Fixes #17506
---
See merge request !4135
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/hooks_controller.rb | 3 | ||||
| -rw-r--r-- | app/views/projects/hooks/_project_hook.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/hooks/index.html.haml | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb index 47524b1cf0b..a60027ff477 100644 --- a/app/controllers/projects/hooks_controller.rb +++ b/app/controllers/projects/hooks_controller.rb @@ -63,7 +63,8 @@ class Projects::HooksController < Projects::ApplicationController :push_events, :tag_push_events, :token, - :url + :url, + :wiki_page_events ) end end diff --git a/app/views/projects/hooks/_project_hook.html.haml b/app/views/projects/hooks/_project_hook.html.haml index 62eba5888a4..8151187d499 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).each do |trigger| + - %w(push_events tag_push_events issues_events note_events merge_requests_events build_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/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml index cffe9a01a96..917a0b805b1 100644 --- a/app/views/projects/hooks/index.html.haml +++ b/app/views/projects/hooks/index.html.haml @@ -64,6 +64,13 @@ Build events %p.light This url will be triggered when the build status changes + %div + = f.check_box :wiki_page_events, class: 'pull-left' + .prepend-left-20 + = f.label :wiki_page_events, class: 'label-light append-bottom-0' do + Wiki Page events + %p.light + This url will be triggered when a wiki page is created/updated .form-group = f.label :enable_ssl_verification, "SSL verification", class: "label-light" %div |