Merge branch 'update_new_delete_button_style_behind_feature_flag' into 'master'

Update new delete branch button style variant

See merge request gitlab-org/gitlab!66102

app/assets/javascripts/branches/components/delete_branch_button.vue

@@ -47,12 +47,6 @@ export default {
     },
   },
   computed: {
-    variant() {
-      if (this.disabled) {
-        return 'default';
-      }
-      return 'danger';
-    },
     title() {
       if (this.isProtectedBranch && this.disabled) {
         return s__('Branches|Only a project maintainer or owner can delete a protected branch');
@@ -83,7 +77,7 @@ export default {
     class="js-delete-branch-button"
     data-qa-selector="delete_branch_button"
     :disabled="disabled"
-    :variant="variant"
+    variant="default"
     :title="title"
     :aria-label="title"
     @click="openModal"

spec/frontend/branches/components/delete_branch_button_spec.js

@@ -34,7 +34,7 @@ describe('Delete branch button', () => {
 
     expect(findDeleteButton().attributes()).toMatchObject({
       title: 'Delete branch',
-      variant: 'danger',
+      variant: 'default',
       icon: 'remove',
     });
   });
@@ -44,7 +44,7 @@ describe('Delete branch button', () => {
 
     expect(findDeleteButton().attributes()).toMatchObject({
       title: 'Delete protected branch',
-      variant: 'danger',
+      variant: 'default',
       icon: 'remove',
     });
   });
@@ -78,7 +78,7 @@ describe('Delete branch button', () => {
 
       expect(findDeleteButton().attributes()).toMatchObject({
         title: 'Delete branch',
-        variant: 'danger',
+        variant: 'default',
       });
     });