Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-11-04 12:11:46 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-04 12:11:46 +0300
commit9f0d27648937cb04d685ca9207f5c45f3ac98010 (patch)
tree00c30674524f01538edbb4c0aaddbfa96b78f3a3 /app/views/projects/branches
parent0250f48d9fc064b902d37e58f09715df0e1dd4e5 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/branches')
-rw-r--r--app/views/projects/branches/_branch.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 12e9044ad24..51c218f40b9 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -46,4 +46,5 @@
= render 'projects/buttons/download', project: @project, ref: branch.name, pipeline: @refs_pipelines[branch.name], class: 'gl-vertical-align-top'
- = render 'projects/branches/delete_branch_modal_button', project: @project, branch: branch, merged: merged
+ - if can?(current_user, :push_code, @project)
+ = render 'projects/branches/delete_branch_modal_button', project: @project, branch: branch, merged: merged