diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-03 18:07:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-03 18:07:55 +0300 |
| commit | 62098c11d130722cca6d4864b3a5257bc3fa8fa1 (patch) | |
| tree | 1f2e2a6fe7f059375b98a76fc040ed15f5e8a3c4 /app/assets/javascripts/runner | |
| parent | 5fabe42e23beba3fbe393e566a5a4ebde2062c61 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/runner')
| -rw-r--r-- | app/assets/javascripts/runner/admin_runner_show/admin_runner_show_app.vue | 7 | ||||
| -rw-r--r-- | app/assets/javascripts/runner/components/runner_delete_button.vue | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/javascripts/runner/admin_runner_show/admin_runner_show_app.vue b/app/assets/javascripts/runner/admin_runner_show/admin_runner_show_app.vue index 8a808cbba37..ef48d7799f8 100644 --- a/app/assets/javascripts/runner/admin_runner_show/admin_runner_show_app.vue +++ b/app/assets/javascripts/runner/admin_runner_show/admin_runner_show_app.vue @@ -84,12 +84,7 @@ export default { <template #actions> <runner-edit-button v-if="canUpdate && runner.editAdminUrl" :href="runner.editAdminUrl" /> <runner-pause-button v-if="canUpdate" :runner="runner" /> - <runner-delete-button - v-if="canDelete" - :runner="runner" - category="secondary" - @deleted="onDeleted" - /> + <runner-delete-button v-if="canDelete" :runner="runner" @deleted="onDeleted" /> </template> </runner-header> diff --git a/app/assets/javascripts/runner/components/runner_delete_button.vue b/app/assets/javascripts/runner/components/runner_delete_button.vue index cc54178bc40..62382891df0 100644 --- a/app/assets/javascripts/runner/components/runner_delete_button.vue +++ b/app/assets/javascripts/runner/components/runner_delete_button.vue @@ -165,6 +165,7 @@ export default { :loading="deleting" :disabled="disabled" variant="danger" + category="secondary" v-bind="$attrs" > {{ buttonContent }} |