summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-12 14:18:22 +0200
committerMichel Engelen <michel.engelen@diva-e.com>2019-06-12 14:18:22 +0200
commit2347115e516fc78bc3f2251ceca762478704529d (patch)
treeb5cd8534dfbfd278c4e596052d68ac1d4440ba05
parent9fd9f54642b8d6fbf96a5fc61f84a97713e65a7d (diff)
downloadgitlab-ce-2347115e516fc78bc3f2251ceca762478704529d.tar.gz
changed string `discussion` to `thread` in reply form
-rw-r--r--app/assets/javascripts/notes/mixins/resolvable.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/mixins/resolvable.js b/app/assets/javascripts/notes/mixins/resolvable.js
index 2329727bca2..16b7598ee09 100644
--- a/app/assets/javascripts/notes/mixins/resolvable.js
+++ b/app/assets/javascripts/notes/mixins/resolvable.js
@@ -20,13 +20,13 @@ export default {
resolveButtonTitle() {
if (this.updatedNoteBody) {
if (this.discussionResolved) {
- return __('Comment & unresolve discussion');
+ return __('Comment & unresolve thread');
}
- return __('Comment & resolve discussion');
+ return __('Comment & resolve thread');
}
- return this.discussionResolved ? __('Unresolve discussion') : __('Resolve discussion');
+ return this.discussionResolved ? __('Unresolve thread') : __('Resolve thread');
},
},
methods: {