Commit 0af8309e authored by Douwe Maan's avatar Douwe Maan Committed by Rémy Coutable

Merge branch 'delete-button-on-edit-issue-has-no-confirmation-14474' into 'master'

User has to confirm deletion of issuables

Closes #14474

See merge request !3341
parent ae407262
...@@ -4,6 +4,7 @@ v 8.6.1 (unreleased) ...@@ -4,6 +4,7 @@ v 8.6.1 (unreleased)
- Add option to reload the schema before restoring a database backup. !2807 - Add option to reload the schema before restoring a database backup. !2807
- Restrict notifications for confidential issues. !3334 - Restrict notifications for confidential issues. !3334
- Do not allow to move issue if it has not been persisted. !3340 - Do not allow to move issue if it has not been persisted. !3340
- Add a confirmation step before deleting an issuable. !3341
- Fixes issue with signin button overflowing on mobile. !3342 - Fixes issue with signin button overflowing on mobile. !3342
- Auto collapses the navigation sidebar when resizing. !3343 - Auto collapses the navigation sidebar when resizing. !3343
......
...@@ -131,7 +131,8 @@ ...@@ -131,7 +131,8 @@
- else - else
.pull-right .pull-right
- if current_user.can?(:"destroy_#{issuable.to_ability_name}", @project) - 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 = 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') = icon('trash-o')
Delete Delete
= link_to 'Cancel', namespace_project_issue_path(@project.namespace, @project, issuable), class: 'btn btn-grouped btn-cancel' = link_to 'Cancel', namespace_project_issue_path(@project.namespace, @project, issuable), class: 'btn btn-grouped btn-cancel'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment