Merge branch 'ph/33423/fixCommitReplyForm' into 'master'

Fixes the misaligned avatar in commit discussion form

Closes #33423

See merge request gitlab-org/gitlab!30481

app/assets/javascripts/notes.js

@@ -964,11 +964,11 @@ export default class Notes {
 
     form
       .prepend(
-        `<div class="avatar-note-form-holder"><div class="content"><a href="${escape(
+        `<a href="${escape(
           gon.current_username,
         )}" class="user-avatar-link d-none d-sm-block"><img class="avatar s40" src="${encodeURI(
-          gon.current_user_avatar_url,
-        )}" alt="${escape(gon.current_user_fullname)}" /></a></div></div>`,
+          gon.current_user_avatar_url || gon.default_avatar_url,
+        )}" alt="${escape(gon.current_user_fullname)}" /></a>`,
       )
       .append('</div>')
       .find('.js-close-discussion-note-form')

app/views/shared/notes/_form.html.haml

@@ -5,7 +5,7 @@
 - else
   - preview_url = preview_markdown_path(@project)
 
-= form_for form_resources, url: new_form_url, remote: true, html: { :'data-type' => 'json', multipart: true, id: nil, class: "new-note js-new-note-form js-quick-submit common-note-form", "data-noteable-iid" => @note.noteable.try(:iid), }, authenticity_token: true do |f|
+= form_for form_resources, url: new_form_url, remote: true, html: { :'data-type' => 'json', multipart: true, id: nil, class: "new-note js-new-note-form js-quick-submit common-note-form discussion-reply-holder", "data-noteable-iid" => @note.noteable.try(:iid), }, authenticity_token: true do |f|
   = hidden_field_tag :view, diff_view
   = hidden_field_tag :line_type
   = hidden_field_tag :merge_request_diff_head_sha, @note.noteable.try(:diff_head_sha)
@@ -24,7 +24,7 @@
   -# DiffNote
   = f.hidden_field :position
 
-  .discussion-form-container
+  .discussion-form-container.discussion-with-resolve-btn.flex-column.p-0
     = render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do
       = render 'projects/zen', f: f,
         attr: :note,

changelogs/unreleased/ph-33423-fixCommitReplyForm.yml

+---
+title: Fixed misaligned avatar in commit discussion form
+merge_request:
+author:
+type: fixed