diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 18:09:05 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 18:09:05 +0000 |
commit | c2367afbf57ebc65d5b78a743b5d6a91f0aece9f (patch) | |
tree | 165c2c54bf72ab3a3a9417d97f63ece5c9eba9f5 /app/views/shared | |
parent | 51a9512965d86e3094968fa514e4ae8a96d38cf3 (diff) | |
download | gitlab-ce-c2367afbf57ebc65d5b78a743b5d6a91f0aece9f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
-rw-r--r-- | app/views/shared/web_hooks/_form.html.haml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml index 9c5b9593bba..ce85cbd7f07 100644 --- a/app/views/shared/web_hooks/_form.html.haml +++ b/app/views/shared/web_hooks/_form.html.haml @@ -15,62 +15,62 @@ = form.check_box :push_events, class: 'form-check-input' = form.label :push_events, class: 'list-label form-check-label ml-1' do %strong Push events - %p.light.ml-1 + = form.text_field :push_events_branch_filter, class: 'form-control', placeholder: 'Branch name or wildcard pattern to trigger on (leave blank for all)' + %p.text-muted.ml-1 This URL will be triggered by a push to the repository - = form.text_field :push_events_branch_filter, class: 'form-control', placeholder: 'Branch name or wildcard pattern to trigger on (leave blank for all)' %li = form.check_box :tag_push_events, class: 'form-check-input' = form.label :tag_push_events, class: 'list-label form-check-label ml-1' do %strong Tag push events - %p.light.ml-1 + %p.text-muted.ml-1 This URL will be triggered when a new tag is pushed to the repository %li = form.check_box :note_events, class: 'form-check-input' = form.label :note_events, class: 'list-label form-check-label ml-1' do %strong Comments - %p.light.ml-1 + %p.text-muted.ml-1 This URL will be triggered when someone adds a comment %li = form.check_box :confidential_note_events, class: 'form-check-input' = form.label :confidential_note_events, class: 'list-label form-check-label ml-1' do %strong Confidential Comments - %p.light.ml-1 + %p.text-muted.ml-1 This URL will be triggered when someone adds a comment on a confidential issue %li = form.check_box :issues_events, class: 'form-check-input' = form.label :issues_events, class: 'list-label form-check-label ml-1' do %strong Issues events - %p.light.ml-1 + %p.text-muted.ml-1 This URL will be triggered when an issue is created/updated/merged %li = form.check_box :confidential_issues_events, class: 'form-check-input' = form.label :confidential_issues_events, class: 'list-label form-check-label ml-1' do %strong Confidential Issues events - %p.light.ml-1 + %p.text-muted.ml-1 This URL will be triggered when a confidential issue is created/updated/merged %li = form.check_box :merge_requests_events, class: 'form-check-input' = form.label :merge_requests_events, class: 'list-label form-check-label ml-1' do %strong Merge request events - %p.light.ml-1 + %p.text-muted.ml-1 This URL will be triggered when a merge request is created/updated/merged %li = form.check_box :job_events, class: 'form-check-input' = form.label :job_events, class: 'list-label form-check-label ml-1' do %strong Job events - %p.light.ml-1 + %p.text-muted.ml-1 This URL will be triggered when the job status changes %li = form.check_box :pipeline_events, class: 'form-check-input' = form.label :pipeline_events, class: 'list-label form-check-label ml-1' do %strong Pipeline events - %p.light.ml-1 + %p.text-muted.ml-1 This URL will be triggered when the pipeline status changes %li = form.check_box :wiki_page_events, class: 'form-check-input' = form.label :wiki_page_events, class: 'list-label form-check-label ml-1' do %strong Wiki Page events - %p.light.ml-1 + %p.text-muted.ml-1 This URL will be triggered when a wiki page is created/updated .form-group = form.label :enable_ssl_verification, 'SSL verification', class: 'label-bold checkbox' |