summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-21 12:54:55 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-21 12:54:55 +0000
commit671c6d7d577d6b872bee7634c4eaf6b4da16919f (patch)
treedd42a8956b92aefbd270f1696d30b358a48f07bd /app/views
parent0be557331d8341fef473ca59e63116ef60f400e6 (diff)
parent452d1d0824f44664484c35a2acc7c008c8167196 (diff)
downloadgitlab-ce-671c6d7d577d6b872bee7634c4eaf6b4da16919f.tar.gz
Merge branch 'ee-870-backport' into 'master'
Backport some changes done from Time Tracking feature in EE. See merge request !7604
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/issuable/_form.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 2fe9e82194b..9b9ad510444 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -125,7 +125,7 @@
- else
.pull-right
- if can?(current_user, :"destroy_#{issuable.to_ability_name}", @project)
- = link_to 'Delete', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), data: { confirm: "#{issuable.class.name.titleize} will be removed! Are you sure?" },
+ = link_to 'Delete', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), data: { confirm: "#{issuable.human_class_name} will be removed! Are you sure?" },
method: :delete, class: 'btn btn-danger btn-grouped'
= link_to 'Cancel', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), class: 'btn btn-grouped btn-cancel'