Merge branch...

Merge branch '238530-add-new-diff-note-icon-on-commit-page-is-currently-broken-on-canary' into 'master'

Fix broken add note icon styles on Commit#show page

See merge request gitlab-org/gitlab!39789

app/helpers/notes_helper.rb

@@ -57,14 +57,16 @@ module NotesHelper
   def add_diff_note_button(line_code, position, line_type)
     return if @diff_notes_disabled
 
+    content_tag(:span, class: 'add-diff-note tooltip-wrapper') do
       button_tag '',
-      class: 'add-diff-note js-add-diff-note-button',
+        class: 'note-button add-diff-note js-add-diff-note-button',
         type: 'submit', name: 'button',
         data: diff_view_line_data(line_code, position, line_type),
         title: _('Add a comment to this line') do
           sprite_icon('comment', size: 12)
         end
     end
+  end
 
   def link_to_reply_discussion(discussion, line_type = nil)
     return unless current_user