summaryrefslogtreecommitdiff
path: root/app/views/projects/milestones
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-03 13:27:11 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-03 13:27:11 +0100
commitf3de9d784cc34a87dfd96cf10fb5355403da3010 (patch)
tree8dc52666d948dd1704de0e098f0594c1e1c95401 /app/views/projects/milestones
parent0833057494dcf84c789fee8a1dd2c3f3f541d036 (diff)
parent6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff)
downloadgitlab-ce-f3de9d784cc34a87dfd96cf10fb5355403da3010.tar.gz
Merge branch 'master' into ui/milestonesui/milestones
Diffstat (limited to 'app/views/projects/milestones')
-rw-r--r--app/views/projects/milestones/_milestone.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/milestones/_milestone.html.haml b/app/views/projects/milestones/_milestone.html.haml
index 5e93d55b1fb..334172b976f 100644
--- a/app/views/projects/milestones/_milestone.html.haml
+++ b/app/views/projects/milestones/_milestone.html.haml
@@ -31,4 +31,4 @@
= link_to 'Close Milestone', namespace_project_milestone_path(@project.namespace, @project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-xs btn-close"
= link_to namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone), data: { confirm: 'Are you sure?' }, method: :delete, class: "btn btn-xs btn-remove" do
%i.fa.fa-trash-o
- Remove
+ Delete