summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Engelen <michel@nomorejs.net>2019-07-02 09:43:03 +0200
committerMichel Engelen <michel@nomorejs.net>2019-07-02 14:30:19 +0200
commitdde46ac6b345a83afb5e41039810e79a5ef79e6a (patch)
treee0f80a9875c8b54cd0a0dbbad83364572c9f5e98
parentad5bd4ad4ff4eb442a9bfcac4ac154c2aa5e037f (diff)
downloadgitlab-ce-dde46ac6b345a83afb5e41039810e79a5ef79e6a.tar.gz
replaced `discussion` with `thread` in comment button
-rw-r--r--app/assets/javascripts/diff_notes/components/comment_resolve_btn.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js
index f66e07ba31a..7817b41514d 100644
--- a/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js
+++ b/app/assets/javascripts/diff_notes/components/comment_resolve_btn.js
@@ -32,15 +32,15 @@ const CommentAndResolveBtn = Vue.extend({
buttonText: function() {
if (this.isDiscussionResolved) {
if (this.textareaIsEmpty) {
- return __('Unresolve discussion');
+ return __('Unresolve thread');
} else {
- return __('Comment & unresolve discussion');
+ return __('Comment & unresolve thread');
}
} else {
if (this.textareaIsEmpty) {
- return __('Resolve discussion');
+ return __('Resolve thread');
} else {
- return __('Comment & resolve discussion');
+ return __('Comment & resolve thread');
}
}
},