diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:09:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:09:34 +0000 |
| commit | c780abc85fd718ffa4f922aa9db826543fd49d36 (patch) | |
| tree | 499d968986370fe898962c0b3a99f3f48b804985 /app/views/projects/merge_requests/_merge_request.html.haml | |
| parent | a7608a4940a91e14754d56a7acbe496321fed99c (diff) | |
| download | gitlab-ce-c780abc85fd718ffa4f922aa9db826543fd49d36.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/merge_requests/_merge_request.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index d3e98bac7f9..567dbbcd498 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -45,13 +45,13 @@ = _('MERGED') - elsif merge_request.closed? %li.issuable-status.d-none.d-sm-inline-block - = icon('ban') + = sprite_icon('cancel', size: 16, css_class: 'gl-vertical-align-text-bottom') = _('CLOSED') = render 'shared/merge_request_pipeline_status', merge_request: merge_request - if merge_request.open? && merge_request.broken? %li.issuable-pipeline-broken.d-none.d-sm-flex = link_to merge_request_path(merge_request), class: "has-tooltip", title: _('Cannot be merged automatically') do - = icon('exclamation-triangle') + = sprite_icon('warning-solid', size: 16) - if merge_request.assignees.any? %li.d-flex = render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request |