diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 09:07:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 09:07:52 +0000 |
| commit | 7e019504f5ac6decde690565857238e7e59aa034 (patch) | |
| tree | fab8832b40e25fc9bc1ae54b9303b95ea146b5d5 /app/views/projects/merge_requests | |
| parent | 116d4e56e83a1f408afe710ce070e699ba206475 (diff) | |
| download | gitlab-ce-7e019504f5ac6decde690565857238e7e59aa034.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/_awards_block.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/_awards_block.html.haml b/app/views/projects/merge_requests/_awards_block.html.haml index 1eab28a2ff3..c1e92e22590 100644 --- a/app/views/projects/merge_requests/_awards_block.html.haml +++ b/app/views/projects/merge_requests/_awards_block.html.haml @@ -2,4 +2,6 @@ = 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 = render "projects/merge_requests/discussion_filter" |