diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-03-05 11:43:29 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-03-05 11:43:29 +0300 |
| commit | d317aaf70f49fc71be2bfa43e0668cc5e5277ddc (patch) | |
| tree | 2bb9cebd328d4b0f2b0466af9ac3e6fd3d3da1c4 /app/views/shared | |
| parent | 17a014faa6a64dfd6695c227e6f3d6c5edc43c26 (diff) | |
| parent | 99b2a5a2ebcf878b09e0591a7e4c39fe533e8e74 (diff) | |
Merge branch '45305-ci-status-icon-mismatch-on-merge-requests-page-and-the-mr-itself' into 'master'
Resolve "CI status icon mismatch on Merge Requests page and the MR itself"
Closes #45305
See merge request gitlab-org/gitlab-ce!25407
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index f1a87faa7ac..d2b1be29eb9 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -85,7 +85,8 @@ = sprite_icon('issues', size: 14, css_class: 'append-right-4') = number_with_delimiter(project.open_issues_count) - if pipeline_status && can?(current_user, :read_cross_project) && project.pipeline_status.has_status? && can?(current_user, :read_build, project) + - pipeline_path = pipelines_project_commit_path(project.pipeline_status.project, project.pipeline_status.sha, ref: project.pipeline_status.ref) %span.icon-wrapper.pipeline-status - = render_project_pipeline_status(project.pipeline_status, tooltip_placement: 'top') + = render 'ci/status/icon', status: project.commit.last_pipeline.detailed_status(current_user), type: 'commit', tooltip_placement: 'top', path: pipeline_path .updated-note %span Updated #{updated_tooltip} |