diff options
author | Michel Engelen <michel.engelen@diva-e.com> | 2019-06-12 14:18:22 +0200 |
---|---|---|
committer | Michel Engelen <michel@nomorejs.net> | 2019-07-02 14:29:03 +0200 |
commit | 897e5eed0887abe8fdeaf57b75c94e2ef9bdeb3a (patch) | |
tree | 6a53707458086b80523503ba03f0ea7430b0cd72 | |
parent | 28d4a0658572bcc214dc36d85f848bc47892dd6f (diff) | |
download | gitlab-ce-897e5eed0887abe8fdeaf57b75c94e2ef9bdeb3a.tar.gz |
changed string `discussion` to `thread` in reply form
-rw-r--r-- | app/assets/javascripts/notes/mixins/resolvable.js | 6 |
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: { |