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:
authorJeff Stubler <brunsa2@gmail.com>2015-12-04 06:53:06 +0300
committerJeff Stubler <brunsa2@gmail.com>2015-12-04 06:53:06 +0300
commit932a7fd96f5977db6119205daa85495ea161dd68 (patch)
tree251f02d786fcec000bacfb3d19e063a636fc9635 /app/views/projects/branches/_branch.html.haml
parent64ca9cf3e4a56a19f09160a91c5433d2ddb632cf (diff)
parente9d06903dab75129a0df63e686e18e85bfaeee8d (diff)
Merge branch 'master' into diverging-branch-graphs
Diffstat (limited to 'app/views/projects/branches/_branch.html.haml')
-rw-r--r--app/views/projects/branches/_branch.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index a4202d1120d..3dfce3c1dd6 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -30,7 +30,7 @@
Compare
- if can_remove_branch?(@project, branch.name)
- = link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-grouped btn-xs btn-remove remove-row', method: :delete, data: { confirm: 'Removed branch cannot be restored. Are you sure?'}, remote: true do
+ = link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-grouped btn-xs btn-remove remove-row', method: :delete, data: { confirm: "Deleting the '#{branch.name}' branch cannot be undone. Are you sure?" }, remote: true do
= icon("trash-o")
- if branch.name != @repository.root_ref