diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/assets/javascripts/alerts_service_settings/components/alerts_service_form.vue | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/assets/javascripts/alerts_service_settings/components/alerts_service_form.vue')
-rw-r--r-- | app/assets/javascripts/alerts_service_settings/components/alerts_service_form.vue | 23 |
1 files changed, 19 insertions, 4 deletions
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 { <gl-form-group :label="__('Active')" label-for="activated" label-class="label-bold"> <toggle-button id="activated" - :disabled-input="loadingActivated" + :disabled-input="loadingActivated || isDisabled" :is-loading="loadingActivated" :value="activated" @change="toggleActivated" @@ -152,7 +157,11 @@ export default { <div class="input-group"> <gl-form-input id="url" :readonly="true" :value="url" /> <span class="input-group-append"> - <clipboard-button :text="url" :title="$options.COPY_TO_CLIPBOARD" /> + <clipboard-button + :text="url" + :title="$options.COPY_TO_CLIPBOARD" + :disabled="isDisabled" + /> </span> </div> </gl-form-group> @@ -164,10 +173,16 @@ export default { <div class="input-group"> <gl-form-input id="authorization-key" :readonly="true" :value="authorizationKey" /> <span class="input-group-append"> - <clipboard-button :text="authorizationKey" :title="$options.COPY_TO_CLIPBOARD" /> + <clipboard-button + :text="authorizationKey" + :title="$options.COPY_TO_CLIPBOARD" + :disabled="isDisabled" + /> </span> </div> - <gl-button v-gl-modal.authKeyModal class="mt-2">{{ $options.RESET_KEY }}</gl-button> + <gl-button v-gl-modal.authKeyModal class="mt-2" :disabled="isDisabled">{{ + $options.RESET_KEY + }}</gl-button> <gl-modal modal-id="authKeyModal" :title="$options.RESET_KEY" |