Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 3 insertions, 29 deletions

diff --git a/app/assets/javascripts/runner/components/runner_delete_button.vue b/app/assets/javascripts/runner/components/runner_delete_button.vue
index 62382891df0..b4f022a7d14 100644
--- a/app/assets/javascripts/runner/components/runner_delete_button.vue
+++ b/app/assets/javascripts/runner/components/runner_delete_button.vue
@@ -5,12 +5,7 @@ import { createAlert } from '~/flash';
 import { sprintf } from '~/locale';
 import { captureException } from '~/runner/sentry_utils';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import {
-  I18N_DELETE_DISABLED_MANY_PROJECTS,
-  I18N_DELETE_DISABLED_UNKNOWN_REASON,
-  I18N_DELETE_RUNNER,
-  I18N_DELETED_TOAST,
-} from '../constants';
+import { I18N_DELETE_RUNNER, I18N_DELETED_TOAST } from '../constants';
 import RunnerDeleteModal from './runner_delete_modal.vue';
 
 export default {
@@ -31,11 +26,6 @@ export default {
         return runner?.id && runner?.shortSha;
       },
     },
-    disabled: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     compact: {
       type: Boolean,
       required: false,
@@ -85,29 +75,14 @@ export default {
       return null;
     },
     tooltip() {
-      if (this.disabled && this.runner.projectCount > 1) {
-        return I18N_DELETE_DISABLED_MANY_PROJECTS;
-      }
-      if (this.disabled) {
-        return I18N_DELETE_DISABLED_UNKNOWN_REASON;
-      }
-
       // Only show basic "delete" tooltip when compact.
       // Also prevent a "sticky" tooltip: If this button is
-      // disabled, mouseout listeners don't run leaving the tooltip stuck
+      // loading, mouseout listeners don't run leaving the tooltip stuck
       if (this.compact && !this.deleting) {
         return I18N_DELETE_RUNNER;
       }
       return '';
     },
-    wrapperTabindex() {
-      if (this.disabled) {
-        // Trigger tooltip on keyboard-focusable wrapper
-        // See https://bootstrap-vue.org/docs/directives/tooltip
-        return '0';
-      }
-      return null;
-    },
   },
   methods: {
     async onDelete() {
@@ -156,14 +131,13 @@ export default {
 </script>
 
 <template>
-  <div v-gl-tooltip="tooltip" class="btn-group" :tabindex="wrapperTabindex">
+  <div v-gl-tooltip="tooltip" class="btn-group">
     <gl-button
       v-gl-modal="runnerDeleteModalId"
       :aria-label="ariaLabel"
       :icon="icon"
       :class="buttonClass"
       :loading="deleting"
-      :disabled="disabled"
       variant="danger"
       category="secondary"
       v-bind="$attrs"