diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-15 15:11:45 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-05-16 14:12:19 +0200 |
| commit | 1fd83f972cf5ce73b3e46fd2df5ffb07889b1fd1 (patch) | |
| tree | 5ac1407d05f4ab5b70baa8db65944b44dc8198fd /app/views/admin/hooks | |
| parent | bcc5135ba5c48130fc8afce035726057d0445e5b (diff) | |
| download | gitlab-ce-1fd83f972cf5ce73b3e46fd2df5ffb07889b1fd1.tar.gz | |
Merge branch 'bvl-rename-build-events-to-job-events' into 'master'
cherry-pick-0663458c
Rename `build_events` to `job_events`
Closes #31620
See merge request !11287
Diffstat (limited to 'app/views/admin/hooks')
| -rw-r--r-- | app/views/admin/hooks/index.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml index 3338b677bf5..e92b8bc39f4 100644 --- a/app/views/admin/hooks/index.html.haml +++ b/app/views/admin/hooks/index.html.haml @@ -27,7 +27,7 @@ = link_to 'Remove', admin_hook_path(hook), data: { confirm: 'Are you sure?' }, method: :delete, class: 'btn btn-remove btn-sm' .monospace= hook.url %div - - %w(repository_update_events push_events tag_push_events issues_events note_events merge_requests_events build_events).each do |trigger| + - %w(repository_update_events push_events tag_push_events issues_events note_events merge_requests_events job_events).each do |trigger| - if hook.send(trigger) %span.label.label-gray= trigger.titleize %span.label.label-gray SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'} |