diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-09 09:13:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-09 09:13:16 +0000 |
| commit | ece36a21699c2a218b8bd14b22bea47d22218354 (patch) | |
| tree | 8e08e12d70ead67a9b1f6951d29661463fda6387 /app/views/projects/branches/index.html.haml | |
| parent | e168d3919a2c82eafa1d1f81e4b96aedae28717a (diff) | |
| download | gitlab-ce-ece36a21699c2a218b8bd14b22bea47d22218354.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/branches/index.html.haml')
| -rw-r--r-- | app/views/projects/branches/index.html.haml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml index ebe0372ddaf..64adf97b1b5 100644 --- a/app/views/projects/branches/index.html.haml +++ b/app/views/projects/branches/index.html.haml @@ -24,11 +24,6 @@ sorted_by: @sort } } - - if can_push_code - .js-delete-merged-branches{ data: { - default_branch: @project.repository.root_ref, - form_path: project_merged_branches_path(@project) } - } - if is_branch_rules_available = link_to project_settings_repository_path(@project, anchor: 'js-branch-rules'), class: 'gl-button btn btn-default' do = s_('Branches|View branch rules') @@ -36,6 +31,10 @@ - if can_push_code = link_to new_project_branch_path(@project), class: 'gl-button btn btn-confirm' do = s_('Branches|New branch') + .js-delete-merged-branches{ data: { + default_branch: @project.repository.root_ref, + form_path: project_merged_branches_path(@project) } + } = render_if_exists 'projects/commits/mirror_status' |