diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-13 21:08:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-13 21:08:35 +0300 |
commit | e62d575077d6265497d7bbc7a31548ab15908a9e (patch) | |
tree | 5e10d28367cfe2652aacadd2ea0cdc8094c503cd /app/views/discussions/_notes.html.haml | |
parent | f62886ebffeda00b6972f1644097a6b9f5016453 (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 | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index a35ba12dd52..e34a5cebe78 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -15,16 +15,14 @@ = badge_counter = render partial: "shared/notes/note", collection: discussion.notes, as: :note, locals: { badge_counter: badge_counter, show_image_comment_badge: show_image_comment_badge } - .flash-container - - .discussion-reply-holder - - if can_create_note? - .discussion-with-resolve-btn - = link_to_reply_discussion(discussion) - - elsif !current_user - .disabled-comment.text-center - Please - = link_to "register", new_session_path(:user, redirect_to_referer: 'yes') - or - = link_to "sign in", new_session_path(:user, redirect_to_referer: 'yes') - to reply + %li.discussion-reply-holder.clearfix{ class: 'gl-border-t-0! gl-pb-5!' } + - if can_create_note? + .discussion-with-resolve-btn + = link_to_reply_discussion(discussion) + - elsif !current_user + .disabled-comment.text-center + Please + = link_to "register", new_session_path(:user, redirect_to_referer: 'yes') + or + = link_to "sign in", new_session_path(:user, redirect_to_referer: 'yes') + to reply |