diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/branches/components/delete_branch_button.vue | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/branches/components/delete_branch_button.vue')
-rw-r--r-- | app/assets/javascripts/branches/components/delete_branch_button.vue | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/app/assets/javascripts/branches/components/delete_branch_button.vue b/app/assets/javascripts/branches/components/delete_branch_button.vue index 5a5f49e25e7..6a6d4d48c52 100644 --- a/app/assets/javascripts/branches/components/delete_branch_button.vue +++ b/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" |