diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 18:09:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 18:09:12 +0300 |
commit | 4821e72a016e4559b53b85ef12cb3971864419b0 (patch) | |
tree | 2f039055e48a8a00d2f10a4cdd65ed3a17cc8c32 /app/assets/javascripts/pipelines | |
parent | f167d24074de8777f1d445af884a7315763aa213 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipelines')
-rw-r--r-- | app/assets/javascripts/pipelines/components/header_component.vue | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/app/assets/javascripts/pipelines/components/header_component.vue b/app/assets/javascripts/pipelines/components/header_component.vue index 37878f3fb6d..fabae62fc45 100644 --- a/app/assets/javascripts/pipelines/components/header_component.vue +++ b/app/assets/javascripts/pipelines/components/header_component.vue @@ -63,6 +63,18 @@ export default { default: '', }, }, + modal: { + id: DELETE_MODAL_ID, + actionPrimary: { + text: __('Delete pipeline'), + attributes: { + variant: 'danger', + }, + }, + actionCancel: { + text: __('Cancel'), + }, + }, apollo: { pipeline: { context() { @@ -275,7 +287,7 @@ export default { <gl-button v-if="pipeline.userPermissions.destroyPipeline" - v-gl-modal="$options.DELETE_MODAL_ID" + v-gl-modal="$options.modal.id" :loading="isDeleting" :disabled="isDeleting" class="gl-ml-3" @@ -289,11 +301,11 @@ export default { <gl-loading-icon v-if="isLoadingInitialQuery" size="lg" class="gl-mt-3 gl-mb-3" /> <gl-modal - :modal-id="$options.DELETE_MODAL_ID" + :modal-id="$options.modal.id" :title="__('Delete pipeline')" - :ok-title="__('Delete pipeline')" - ok-variant="danger" - @ok="deletePipeline()" + :action-primary="$options.modal.actionPrimary" + :action-cancel="$options.modal.actionCancel" + @primary="deletePipeline()" > <p> {{ deleteModalConfirmationText }} |