diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-13 17:16:30 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-13 17:16:30 +0000 |
| commit | 9c9893dd6d1d1b2e8677ac163ba1ff62362e63ff (patch) | |
| tree | 6be22f8780cddfefa84b764e48832d6f67572d66 /app/views | |
| parent | e17f79fdfa40fb7cef02bdbc3f0f72a67da12893 (diff) | |
| parent | 72e2c1db19fe9a3f45e5df89c03e8077e064ec8b (diff) | |
| download | gitlab-ce-9c9893dd6d1d1b2e8677ac163ba1ff62362e63ff.tar.gz | |
Merge branch '14762-delete-button' into 'master'
Update delete button
Closes #14762
See merge request !3665
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 1c89a2ee7f3..6de07a92cd7 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -128,8 +128,6 @@ - else .pull-right - if current_user.can?(:"destroy_#{issuable.to_ability_name}", @project) - = link_to polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), data: { confirm: "#{issuable.class.name.titleize} will be removed! Are you sure?" }, - method: :delete, class: 'btn btn-grouped' do - = icon('trash-o') - Delete + = link_to 'Delete', polymorphic_path([@project.namespace.becomes(Namespace), @project, issuable]), data: { confirm: "#{issuable.class.name.titleize} 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' |