Merge branch '19804-fix-disappearing-badge-after-commit-edit' into 'master'

Fix disappearing badge in commit image thread edit

See merge request gitlab-org/gitlab!69137

app/assets/javascripts/deprecated_notes.js

@@ -670,6 +670,10 @@ export default class Notes {
   updateNote(noteEntity, $targetNote) {
     // Convert returned HTML to a jQuery object so we can modify it further
     const $noteEntityEl = $(noteEntity.html);
+    const $noteAvatar = $noteEntityEl.find('.image-diff-avatar-link');
+    const $targetNoteBadge = $targetNote.find('.badge');
+
+    $noteAvatar.append($targetNoteBadge);
     this.revertNoteEditForm($targetNote);
     $noteEntityEl.renderGFM();
     // Find the note's `li` element by ID and replace it with the updated HTML