From a09983ae35713f5a2bbb100981116d31ce99826e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Jul 2020 12:26:25 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-2-stable-ee --- .../components/alerts_service_form.vue | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'app/assets/javascripts/alerts_service_settings/components/alerts_service_form.vue') diff --git a/app/assets/javascripts/alerts_service_settings/components/alerts_service_form.vue b/app/assets/javascripts/alerts_service_settings/components/alerts_service_form.vue index ac30b086875..a2d94fb8083 100644 --- a/app/assets/javascripts/alerts_service_settings/components/alerts_service_form.vue +++ b/app/assets/javascripts/alerts_service_settings/components/alerts_service_form.vue @@ -64,6 +64,11 @@ export default { type: Boolean, required: true, }, + isDisabled: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { @@ -142,7 +147,7 @@ export default { - + @@ -164,10 +173,16 @@ export default {
- +
- {{ $options.RESET_KEY }} + {{ + $options.RESET_KEY + }}