Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-03-16 00:07:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-03-16 00:07:57 +0300
commit512177dcc7369c6c3f4ae54cc8a0abcb73828f71 (patch)
tree3ceb4aba221a235c570f6f7e5398b88a381e3ead /app/views/discussions
parent7f08e6916d8259a8ed1549cb54460f0b746d9d8b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/discussions')
-rw-r--r--app/views/discussions/_discussion.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml
index 075eb99fc36..477f6c73388 100644
--- a/app/views/discussions/_discussion.html.haml
+++ b/app/views/discussions/_discussion.html.haml
@@ -11,7 +11,8 @@
%button.note-action-button.discussion-toggle-button.js-toggle-button{ type: "button", class: ("js-toggle-lazy-diff" unless expanded) }
= sprite_icon('chevron-up', css_class: "js-sidebar-collapse #{'hidden' unless expanded}")
= sprite_icon('chevron-down', css_class: "js-sidebar-expand #{'hidden' if expanded}")
- = _('Toggle thread')
+ %span.js-sidebar-collapse{ class: "#{'hidden' unless expanded}" }= _('Hide thread')
+ %span.js-sidebar-expand{ class: "#{'hidden' if expanded}" }= _('Show thread')
= link_to_member(@project, discussion.author, avatar: false)
.inline.discussion-headline-light