diff options
author | Michael Kozono <mkozono@gmail.com> | 2019-08-30 01:04:31 +0300 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2019-08-30 01:04:31 +0300 |
commit | fa160c26b14d233eb2e3b861a0742766d1ac734b (patch) | |
tree | d4c7173ec828491c87d7f28e6e76adbbd1eaaec3 /app/assets/javascripts | |
parent | 873a344e8605310254d8441ac2c77d730c391aea (diff) | |
parent | f6c7e38040492db018943e537e30a7dd10e46120 (diff) |
Merge branch 'sh-add-delete-confirmation' into 'master'
Make it harder to delete issuables accidentally
Closes #62387
See merge request gitlab-org/gitlab-ce!32376
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/issue_show/components/app.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/issue_show/components/edit_actions.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/issue_show/services/index.js | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index 9ca38d6bbfa..88975c2cc73 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -300,9 +300,9 @@ export default { this.closeRecaptcha(); }, - deleteIssuable() { + deleteIssuable(payload) { this.service - .deleteIssuable() + .deleteIssuable(payload) .then(res => res.data) .then(data => { // Stop the poll so we don't get 404's with the issuable not existing diff --git a/app/assets/javascripts/issue_show/components/edit_actions.vue b/app/assets/javascripts/issue_show/components/edit_actions.vue index eb51a074f84..ce867f16acf 100644 --- a/app/assets/javascripts/issue_show/components/edit_actions.vue +++ b/app/assets/javascripts/issue_show/components/edit_actions.vue @@ -55,7 +55,7 @@ export default { if (window.confirm(confirmMessage)) { this.deleteLoading = true; - eventHub.$emit('delete.issuable'); + eventHub.$emit('delete.issuable', { destroy_confirm: true }); } }, }, diff --git a/app/assets/javascripts/issue_show/services/index.js b/app/assets/javascripts/issue_show/services/index.js index 9546eb22c27..3c8334bee50 100644 --- a/app/assets/javascripts/issue_show/services/index.js +++ b/app/assets/javascripts/issue_show/services/index.js @@ -10,8 +10,8 @@ export default class Service { return axios.get(this.realtimeEndpoint); } - deleteIssuable() { - return axios.delete(this.endpoint); + deleteIssuable(payload) { + return axios.delete(this.endpoint, { params: payload }); } updateIssuable(data) { |