diff options
| author | Michel Engelen <michel.engelen@diva-e.com> | 2019-06-13 14:25:11 +0200 |
|---|---|---|
| committer | Michel Engelen <michel.engelen@diva-e.com> | 2019-06-13 14:25:11 +0200 |
| commit | a213b14ec6a07faa88884092f39a94a33d040467 (patch) | |
| tree | 5e65fb23be15e9bcafa243cfb402b5a89b13805c | |
| parent | db3278c4064820111d8702224a1decafcb68921c (diff) | |
| download | gitlab-ce-a213b14ec6a07faa88884092f39a94a33d040467.tar.gz | |
replaced string `discussion` with string `thread` in thread header
| -rw-r--r-- | app/assets/javascripts/notes/components/note_header.vue | 2 | ||||
| -rw-r--r-- | app/views/discussions/_discussion.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/note_header.vue b/app/assets/javascripts/notes/components/note_header.vue index fbf82fab9e9..6466ab3acbe 100644 --- a/app/assets/javascripts/notes/components/note_header.vue +++ b/app/assets/javascripts/notes/components/note_header.vue @@ -70,7 +70,7 @@ export default { @click="handleToggle" > <i :class="toggleChevronClass" class="fa" aria-hidden="true"></i> - {{ __('Toggle discussion') }} + {{ __('Toggle thread') }} </button> </div> <a diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 10187129a33..cc4d2ab64fa 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -13,7 +13,7 @@ = icon("chevron-up") - else = icon("chevron-down") - = _('Toggle discussion') + = _('Toggle thread') = link_to_member(@project, discussion.author, avatar: false) .inline.discussion-headline-light |