diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-25 07:57:52 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-25 07:57:52 +0000 |
| commit | 2d0a9c4cc2a8ba488d156682641408005b8c6df8 (patch) | |
| tree | 4eeaead5b55444ae07408fd84ae35ff8c0e1c045 /app/views | |
| parent | f042b085f64223ffe7b9d26f003ee2db76af27a6 (diff) | |
| parent | deeff56967516764b287e15b2063899b13395b41 (diff) | |
| download | gitlab-ce-2d0a9c4cc2a8ba488d156682641408005b8c6df8.tar.gz | |
Merge branch 'add-webhook-note-events' into 'master'
Add support for Webhook note events
This MR adds support for note events (comments) for WebHooks.
Perhaps the only potential source of confusion is that the settings indicates "Note Events" instead of "Comments". What do you think?
Screenshot after:
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
See merge request !673
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/hooks/index.html.haml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml index 808c03148f4..eadbf61fdd4 100644 --- a/app/views/projects/hooks/index.html.haml +++ b/app/views/projects/hooks/index.html.haml @@ -35,6 +35,13 @@ %p.light This url will be triggered when a new tag is pushed to the repository %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 + %div = f.check_box :issues_events, class: 'pull-left' .prepend-left-20 = f.label :issues_events, class: 'list-label' do @@ -64,6 +71,6 @@ .clearfix %span.monospace= hook.url %p - - %w(push_events tag_push_events issues_events merge_requests_events).each do |trigger| + - %w(push_events tag_push_events issues_events note_events merge_requests_events).each do |trigger| - if hook.send(trigger) %span.label.label-gray= trigger.titleize |