From 8fa0c53e26c947ac647b8067fde3e9673b77b1a6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Nov 2022 18:11:26 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/projects/branches/index.html.haml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'app/views/projects/branches/index.html.haml') diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml index 82276938d45..475bc9e1c20 100644 --- a/app/views/projects/branches/index.html.haml +++ b/app/views/projects/branches/index.html.haml @@ -13,16 +13,10 @@ #js-branches-sort-dropdown{ data: { project_branches_filtered_path: project_branches_path(@project, state: 'all'), sort_options: branches_sort_options_hash.to_json, mode: @mode } } - if can? current_user, :push_code, @project - = link_to project_merged_branches_path(@project), - class: 'gl-button btn btn-danger btn-danger-secondary has-tooltip', - title: s_("Branches|Delete all branches that are merged into '%{default_branch}'") % { default_branch: @project.repository.root_ref }, - method: :delete, - aria: { label: s_('Branches|Delete merged branches') }, - data: { confirm: s_('Branches|Deleting the merged branches cannot be undone. Are you sure?'), - confirm_btn_variant: 'danger', - container: 'body', - qa_selector: 'delete_merged_branches_link' } do - = s_('Branches|Delete merged branches') + .js-delete-merged-branches{ data: { + default_branch: @project.repository.root_ref, + form_path: project_merged_branches_path(@project) } + } = link_to new_project_branch_path(@project), class: 'gl-button btn btn-confirm' do = s_('Branches|New branch') -- cgit v1.2.1