Commit 43cdae4a authored by Fatih Acet's avatar Fatih Acet
Browse files

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
parents cdba3fe8 69ca1597
......@@ -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
......
---
title: Move award emoji's out of the discussion tab for merge requests
merge_request:
author:
......@@ -24,7 +24,7 @@
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 @@
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment