summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-10-02 11:06:34 +0000
committerFilipa Lacerda <filipa@gitlab.com>2017-10-02 11:06:34 +0000
commit28ea45f9783dcc71ec9a06d51654d695c5b3d447 (patch)
tree1fb4acfaf7fcbaddfce92f111937282012439e92
parent12c40494edf5812d5e55992e28e0cc824da0d2eb (diff)
parent3197f415c8f51145209ad72eea7871c0e1acbfea (diff)
downloadgitlab-ce-28ea45f9783dcc71ec9a06d51654d695c5b3d447.tar.gz
Merge branch '38619-fix-comment-delete-confirm-text' into 'master'
Fix typo in comment deletion confirmation dialog Closes #38619 See merge request gitlab-org/gitlab-ce!14622
-rw-r--r--app/assets/javascripts/notes/components/issue_note.vue2
-rw-r--r--changelogs/unreleased/38619-fix-comment-delete-confirm-text.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/issue_note.vue b/app/assets/javascripts/notes/components/issue_note.vue
index 3483f6c7538..1f43b8a16ad 100644
--- a/app/assets/javascripts/notes/components/issue_note.vue
+++ b/app/assets/javascripts/notes/components/issue_note.vue
@@ -62,7 +62,7 @@
},
deleteHandler() {
// eslint-disable-next-line no-alert
- if (confirm('Are you sure you want to delete this list?')) {
+ if (confirm('Are you sure you want to delete this comment?')) {
this.isDeleting = true;
this.deleteNote(this.note)
diff --git a/changelogs/unreleased/38619-fix-comment-delete-confirm-text.yml b/changelogs/unreleased/38619-fix-comment-delete-confirm-text.yml
new file mode 100644
index 00000000000..a203bff8410
--- /dev/null
+++ b/changelogs/unreleased/38619-fix-comment-delete-confirm-text.yml
@@ -0,0 +1,5 @@
+---
+title: Fix comment deletion confirmation dialog typo
+merge_request:
+author:
+type: fixed