diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/views/discussions/_discussion.html.haml | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/views/discussions/_discussion.html.haml')
-rw-r--r-- | app/views/discussions/_discussion.html.haml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 4a27284cbae..075eb99fc36 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -2,17 +2,15 @@ %li.note.note-discussion.timeline-entry.unstyled-comments .timeline-entry-inner .timeline-content - .discussion.js-toggle-container{ data: { discussion_id: discussion.id } } + .discussion.js-toggle-container{ data: { discussion_id: discussion.id, is_expanded: expanded.to_s } } .discussion-header .timeline-icon = link_to user_path(discussion.author) do = image_tag avatar_icon_for_user(discussion.author), class: "avatar s40" .discussion-actions %button.note-action-button.discussion-toggle-button.js-toggle-button{ type: "button", class: ("js-toggle-lazy-diff" unless expanded) } - - if expanded - = icon("chevron-up") - - else - = icon("chevron-down") + = 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') = link_to_member(@project, discussion.author, avatar: false) |