diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 03:09:27 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-15 03:09:27 +0300 |
commit | 30a8d158a29cc09ece1a71771a28f7bc1483506b (patch) | |
tree | 223fab9858e274fff5e901116890d2d7c8ad162b /app/views/projects/merge_requests/_awards_block.html.haml | |
parent | ae93b284016c07a8a4b47e2510789253d14870f3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/merge_requests/_awards_block.html.haml')
-rw-r--r-- | app/views/projects/merge_requests/_awards_block.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_awards_block.html.haml b/app/views/projects/merge_requests/_awards_block.html.haml index c1e92e22590..e4a7b9b7e62 100644 --- a/app/views/projects/merge_requests/_awards_block.html.haml +++ b/app/views/projects/merge_requests/_awards_block.html.haml @@ -2,6 +2,5 @@ = render 'award_emoji/awards_block', awardable: @merge_request, inline: true do - if mr_tabs_position_enabled? .ml-auto.mt-auto.mb-auto - - if Feature.enabled?(:sort_discussions, @merge_request.target_project) - #js-vue-sort-issue-discussions + #js-vue-sort-issue-discussions = render "projects/merge_requests/discussion_filter" |