Commit c53da647 authored by Nathan Friend's avatar Nathan Friend

Merge branch '25344-fire-webhook-on-new-deployment-2' into 'master'

Add deployment events to the webhook edit form

See merge request gitlab-org/gitlab!38902
parents f4726d1b 13cde65b
...@@ -72,6 +72,12 @@ ...@@ -72,6 +72,12 @@
%strong Wiki Page events %strong Wiki Page events
%p.text-muted.ml-1 %p.text-muted.ml-1
This URL will be triggered when a wiki page is created/updated This URL will be triggered when a wiki page is created/updated
%li
= form.check_box :deployment_events, class: 'form-check-input'
= form.label :deployment_events, class: 'list-label form-check-label ml-1' do
%strong= s_('Webhooks|Deployment events')
%p.text-muted.ml-1
= s_('Webhooks|This URL will be triggered when a deployment is finished/failed/canceled')
.form-group .form-group
= form.label :enable_ssl_verification, 'SSL verification', class: 'label-bold checkbox' = form.label :enable_ssl_verification, 'SSL verification', class: 'label-bold checkbox'
.form-check .form-check
......
---
title: Add webhooks for deployments
merge_request: 38902
author:
type: added
...@@ -27373,6 +27373,12 @@ msgstr "" ...@@ -27373,6 +27373,12 @@ msgstr ""
msgid "Webhooks have moved. They can now be found under the Settings menu." msgid "Webhooks have moved. They can now be found under the Settings menu."
msgstr "" msgstr ""
msgid "Webhooks|Deployment events"
msgstr ""
msgid "Webhooks|This URL will be triggered when a deployment is finished/failed/canceled"
msgstr ""
msgid "Wednesday" msgid "Wednesday"
msgstr "" msgstr ""
......
...@@ -36,7 +36,8 @@ RSpec.describe Projects::HooksController do ...@@ -36,7 +36,8 @@ RSpec.describe Projects::HooksController do
note_events: true, note_events: true,
job_events: true, job_events: true,
pipeline_events: true, pipeline_events: true,
wiki_page_events: true wiki_page_events: true,
deployment_events: true
} }
post :create, params: { namespace_id: project.namespace, project_id: project, hook: hook_params } post :create, params: { namespace_id: project.namespace, project_id: project, hook: hook_params }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment