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/helpers | |
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/helpers')
-rw-r--r-- | app/helpers/ci_status_helper.rb | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb index 923a06a0512..355b91a8661 100644 --- a/app/helpers/ci_status_helper.rb +++ b/app/helpers/ci_status_helper.rb @@ -100,17 +100,6 @@ module CiStatusHelper "pipeline-status/#{pipeline_status.sha}-#{pipeline_status.status}" end - def render_project_pipeline_status(pipeline_status, tooltip_placement: 'left') - project = pipeline_status.project - path = pipelines_project_commit_path(project, pipeline_status.sha, ref: pipeline_status.ref) - - render_status_with_link( - 'commit', - pipeline_status.status, - path, - tooltip_placement: tooltip_placement) - end - def render_commit_status(commit, ref: nil, tooltip_placement: 'left') project = commit.project path = pipelines_project_commit_path(project, commit, ref: ref) @@ -123,12 +112,6 @@ module CiStatusHelper icon_size: 24) end - def render_pipeline_status(pipeline, tooltip_placement: 'left') - project = pipeline.project - path = project_pipeline_path(project, pipeline) - render_status_with_link('pipeline', pipeline.status, path, tooltip_placement: tooltip_placement) - end - def render_status_with_link(type, status, path = nil, tooltip_placement: 'left', cssclass: '', container: 'body', icon_size: 16) klass = "ci-status-link ci-status-icon-#{status.dasherize} #{cssclass}" title = "#{type.titleize}: #{ci_label_for_status(status)}" |