summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2019-05-20 10:05:12 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2019-05-20 12:29:32 -0500
commit094e877efd8de154c76993b32e84640a541e21d0 (patch)
tree232b04803ed320d92e5b52fc72d507bf2b2a72fc
parent0c5b3d08dedccb5808c6df6560b3e277035691db (diff)
downloadgitlab-ce-mark-comment-resolved.tar.gz
Change resolve button text to mark comment as resolvedmark-comment-resolved
-rw-r--r--app/assets/javascripts/batch_comments/mixins/resolved_status.js2
-rw-r--r--changelogs/unreleased/mark-comment-resolved.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/batch_comments/mixins/resolved_status.js b/app/assets/javascripts/batch_comments/mixins/resolved_status.js
index 20c31d9f8a4..96ee9f62ba4 100644
--- a/app/assets/javascripts/batch_comments/mixins/resolved_status.js
+++ b/app/assets/javascripts/batch_comments/mixins/resolved_status.js
@@ -1,7 +1,7 @@
export default {
computed: {
resolveButtonTitle() {
- let title = 'Mark as resolved';
+ let title = 'Mark comment as resolved';
if (this.resolvedBy) {
title = `Resolved by ${this.resolvedBy.name}`;
diff --git a/changelogs/unreleased/mark-comment-resolved.yml b/changelogs/unreleased/mark-comment-resolved.yml
new file mode 100644
index 00000000000..3343d18d16f
--- /dev/null
+++ b/changelogs/unreleased/mark-comment-resolved.yml
@@ -0,0 +1,5 @@
+---
+title: Change resolve button text to mark comment as resolved
+merge_request:
+author:
+type: fixed