diff options
| author | dimitrieh <dimitriehoekstra@gmail.com> | 2016-12-28 23:13:23 +0100 |
|---|---|---|
| committer | dimitrieh <dimitriehoekstra@gmail.com> | 2016-12-28 23:13:23 +0100 |
| commit | 72e94991e5199a1230b55591e9e872a93f4fd975 (patch) | |
| tree | f7ec5892d9ef6f4f41cc5a6251642084103c6762 | |
| parent | 19e3ab18af273d3d17deabe7e18cd78a3f903644 (diff) | |
| download | gitlab-ce-72e94991e5199a1230b55591e9e872a93f4fd975.tar.gz | |
Move award emoji's out of the discussion tab for merge requests
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/25996-Move-award-emoji-out-of-the-discussion-tab-for-MR.yml | 4 |
2 files changed, 7 insertions, 3 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: |