Automatic merge of gitlab-org/gitlab-ce master

app/views/projects/notes/_actions.html.haml

@@ -39,7 +39,7 @@
 - if can?(current_user, :award_emoji, note)
   - if note.emoji_awardable?
     .note-actions-item
-      = button_tag title: 'Add reaction', class: "note-action-button note-emoji-button js-add-award js-note-emoji} has-tooltip btn btn-transparent", data: { position: 'right', container: 'body' } do
+      = button_tag title: 'Add reaction', class: "note-action-button note-emoji-button js-add-award js-note-emoji has-tooltip btn btn-transparent", data: { position: 'right', container: 'body' } do
         = icon('spinner spin')
         %span{ class: 'link-highlight award-control-icon-neutral' }= sprite_icon('slight-smile')
         %span{ class: 'link-highlight award-control-icon-positive' }= sprite_icon('smiley')

changelogs/unreleased/54595-incorrect-reaction-emoji-placement-in-discussion.yml

+---
+title: Fix incorrect emoji placement in commit diff discussion
+merge_request: 29445
+author:
+type: fixed

spec/features/discussion_comments/commit_spec.rb

@@ -6,6 +6,8 @@ describe 'Discussion Comments Commit', :js do
   let(:user) { create(:user) }
   let(:project) { create(:project, :repository) }
   let(:merge_request) { create(:merge_request, source_project: project) }
+  let!(:commit_discussion_note1) { create(:discussion_note_on_commit, project: project) }
+  let!(:commit_discussion_note2) { create(:discussion_note_on_commit, in_reply_to: commit_discussion_note1) }
 
   before do
     project.add_maintainer(user)
@@ -15,4 +17,18 @@ describe 'Discussion Comments Commit', :js do
   end
 
   it_behaves_like 'discussion comments', 'commit'
+
+  it 'has class .js-note-emoji' do
+    expect(page).to have_css('.js-note-emoji')
+  end
+
+  it 'adds award to the correct note' do
+    find("#note_#{commit_discussion_note2.id} .js-note-emoji").click
+    first('.emoji-menu .js-emoji-btn').click
+
+    wait_for_requests
+
+    expect(find("#note_#{commit_discussion_note1.id}")).not_to have_css('.js-awards-block')
+    expect(find("#note_#{commit_discussion_note2.id}")).to have_css('.js-awards-block')
+  end
 end