diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-03-23 15:51:38 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-03-23 15:51:38 +0300 |
| commit | a3daead1b00c28a16684cf11970ebd6da27511e2 (patch) | |
| tree | 58798281668a824e1e810b4e65a4038cc2cc5a0d /app | |
| parent | fb30039668f68834d9951746181201423fa8b269 (diff) | |
Include missing events and fix save functionality in admin service template settings form
Closes #1275
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/admin/services_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/admin/services/_form.html.haml | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb index 44a3f1379d8..76a938c5fe4 100644 --- a/app/controllers/admin/services_controller.rb +++ b/app/controllers/admin/services_controller.rb @@ -46,7 +46,9 @@ class Admin::ServicesController < Admin::ApplicationController :user_key, :device, :priority, :sound, :bamboo_url, :username, :password, :build_key, :server, :teamcity_url, :build_type, :description, :issues_url, :new_issue_url, :restrict_to_branch, - :send_from_committer_email, :disable_diffs + :send_from_committer_email, :disable_diffs, + :push_events, :tag_push_events, :note_events, :issues_events, + :merge_requests_events ]) end end diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml index a953833b37c..18b7e8ba270 100644 --- a/app/views/admin/services/_form.html.haml +++ b/app/views/admin/services/_form.html.haml @@ -14,6 +14,11 @@ = preserve do = markdown @service.help + .form-group + = f.label :active, "Active", class: "control-label" + .col-sm-10 + = f.check_box :active + - if @service.supported_events.length > 1 .form-group = f.label :url, "Trigger", class: 'control-label' @@ -34,6 +39,14 @@ %strong Tag push events %p.light This url will be triggered when a new tag is pushed to the repository + - if @service.supported_events.include?("note") + %div + = f.check_box :note_events, class: 'pull-left' + .prepend-left-20 + = f.label :note_events, class: 'list-label' do + %strong Comments + %p.light + This url will be triggered when someone adds a comment - if @service.supported_events.include?("issue") %div = f.check_box :issues_events, class: 'pull-left' |