diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-21 14:12:52 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-21 16:59:35 +0100 |
| commit | 3b088fc5b53f03605484ebef1945b8839abe19de (patch) | |
| tree | 1c058f36cf3610449d4636998b59128b5112131c /app/views/shared/issuable/_form.html.haml | |
| parent | 98fd60f50b6658d21503f548649c8db291050ab7 (diff) | |
| download | gitlab-ce-3b088fc5b53f03605484ebef1945b8839abe19de.tar.gz | |
Minor improvements on IssuableActions
Diffstat (limited to 'app/views/shared/issuable/_form.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 4e1171cfb3d..3457c54bab9 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -114,13 +114,11 @@ for this project. - if issuable.new_record? - = link_to namespace_project_issues_path(@project.namespace, @project), class: 'btn btn-cancel' do - Cancel + = link_to 'Cancel', namespace_project_issues_path(@project.namespace, @project), class: 'btn btn-cancel' - else - - if current_user.can?(:"remove_#{issuable.to_ability_name}", @project) - .pull-right - = link_to polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), method: :delete, class: 'btn' do + .pull-right + - if current_user.can?(:"destroy_#{issuable.to_ability_name}", @project) + = link_to polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), method: :delete, class: 'btn btn-grouped' do = icon('trash-o') Delete - = link_to namespace_project_issue_path(@project.namespace, @project, issuable), class: 'btn btn-cancel' do - Cancel + = link_to 'Cancel', namespace_project_issue_path(@project.namespace, @project, issuable), class: 'btn btn-grouped btn-cancel' |