Merge branch '25996-Move-award-emoji-out-of-the-discussion-tab-for-MR' into 'master'

Move award emoji's out of the discussion tab for merge requests

Closes #25996

See merge request !8358

3 files changed, 9 insertions, 5 deletions

diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index d1fa51ae7ee..393ab1149bc 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -47,6 +47,9 @@
         = succeed '.' do
           = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
 
+    .content-block.content-block-small
+      = render 'award_emoji/awards_block', awardable: @merge_request, inline: true
+
     - if @commits_count.nonzero?
       .merge-request-tabs-holder{ class: ("js-tabs-affix" unless ENV['RAILS_ENV'] == 'test') }
         %div{ class: container_class }
@@ -83,9 +86,6 @@
 
       .tab-content#diff-notes-app
         #notes.notes.tab-pane.voting_notes
-          .content-block.content-block-small
-            = render 'award_emoji/awards_block', awardable: @merge_request, inline: true
-
           .row
             %section.col-md-12
               .issuable-discussion
diff --git a/changelogs/unreleased/25996-Move-award-emoji-out-of-the-discussion-tab-for-MR.yml b/changelogs/unreleased/25996-Move-award-emoji-out-of-the-discussion-tab-for-MR.yml
new file mode 100644
index 00000000000..e05e2dd6fed
--- /dev/null
+++ b/changelogs/unreleased/25996-Move-award-emoji-out-of-the-discussion-tab-for-MR.yml
@@ -0,0 +1,4 @@
+---
+title: Move award emoji's out of the discussion tab for merge requests
+merge_request:
+author:
diff --git a/spec/features/merge_requests/merge_request_versions_spec.rb b/spec/features/merge_requests/merge_request_versions_spec.rb
index 09451f41de4..cd2272dd38f 100644
--- a/spec/features/merge_requests/merge_request_versions_spec.rb
+++ b/spec/features/merge_requests/merge_request_versions_spec.rb
@@ -24,7 +24,7 @@ feature 'Merge Request versions', js: true, feature: true do
     before do
       page.within '.mr-version-dropdown' do
         find('.btn-default').click
-        click_link 'version 1'
+        find(:link, 'version 1').trigger('click')
       end
     end
 
@@ -45,7 +45,7 @@ feature 'Merge Request versions', js: true, feature: true do
     before do
       page.within '.mr-version-compare-dropdown' do
         find('.btn-default').click
-        click_link 'version 1'
+        find(:link, 'version 1').trigger('click')
       end
     end