summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorMichel Engelen <michel.engelen@diva-e.com>2019-06-14 09:05:18 +0200
committerMichel Engelen <michel@nomorejs.net>2019-07-02 14:29:54 +0200
commitc59584f3f88cd65f875b20be8fce93033b58b49b (patch)
treec1d521789e044e8735258982a4d23825e82cd591 /app/assets
parentf4de2453a0ff3c6d229f4424af563b217109e783 (diff)
downloadgitlab-ce-c59584f3f88cd65f875b20be8fce93033b58b49b.tar.gz
replaced string `discussion` wit `thread` in note-form component
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/notes/components/note_form.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue
index 042ed196933..01be4f2b094 100644
--- a/app/assets/javascripts/notes/components/note_form.vue
+++ b/app/assets/javascripts/notes/components/note_form.vue
@@ -283,11 +283,11 @@ export default {
type="checkbox"
class="qa-unresolve-review-discussion"
/>
- {{ __('Unresolve discussion') }}
+ {{ __('Unresolve thread') }}
</template>
<template v-else>
<input v-model="isResolving" type="checkbox" class="qa-resolve-review-discussion" />
- {{ __('Resolve discussion') }}
+ {{ __('Resolve thread') }}
</template>
</label>
</p>