From 69a23cbee136eda0ab37874399421e6865cfc76b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 22 Nov 2019 21:06:19 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/views/projects/merge_requests/_mr_title.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/views/projects/merge_requests') diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml index 92e34b3ceda..552f8dc173a 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -1,5 +1,6 @@ - can_update_merge_request = can?(current_user, :update_merge_request, @merge_request) - can_reopen_merge_request = can?(current_user, :reopen_merge_request, @merge_request) +- state_human_name, state_icon_name = state_name_with_icon(@merge_request) - if @merge_request.closed_without_fork? .alert.alert-danger @@ -8,9 +9,9 @@ .detail-page-header .detail-page-header-body .issuable-status-box.status-box{ class: status_box_class(@merge_request) } - = sprite_icon(@merge_request.state_icon_name, size: 16, css_class: 'd-block d-sm-none') + = sprite_icon(state_icon_name, size: 16, css_class: 'd-block d-sm-none') %span.d-none.d-sm-block - = @merge_request.state_human_name + = state_human_name .issuable-meta - if @merge_request.discussion_locked? -- cgit v1.2.1