diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-28 12:09:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-28 12:09:35 +0300 |
| commit | 15b34520549c1f67bd92469003fe5a9260e34e43 (patch) | |
| tree | 386d8d90c2c627e44650b4989947fec23c143e80 /app/views/discussions/_notes.html.haml | |
| parent | 1d42c38d9b4d4ca651db435c8eb0c47bd24a25e2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/discussions/_notes.html.haml')
| -rw-r--r-- | app/views/discussions/_notes.html.haml | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index cdc6c602277..7db318f83b1 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -21,22 +21,8 @@ - if can_create_note? %a.user-avatar-link.d-none.d-sm-block{ href: user_path(current_user) } = image_tag avatar_icon_for_user(current_user), alt: current_user.to_reference, class: 'avatar s40' - - if discussion.potentially_resolvable? - - line_type = local_assigns.fetch(:line_type, nil) - - .discussion-with-resolve-btn - .btn-group.discussion-with-resolve-btn{ role: "group" } - .btn-group{ role: "group" } - = link_to_reply_discussion(discussion, line_type) - - = render "discussions/resolve_all", discussion: discussion - - .btn-group.discussion-actions - = render "discussions/new_issue_for_discussion", discussion: discussion, merge_request: discussion.noteable - = render "discussions/jump_to_next", discussion: discussion - - else - .discussion-with-resolve-btn - = link_to_reply_discussion(discussion) + .discussion-with-resolve-btn + = link_to_reply_discussion(discussion) - elsif !current_user .disabled-comment.text-center Please |