diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-11-17 09:25:19 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-11-17 09:25:19 +0000 |
| commit | 128cb03bc861580f7bbe3724bf65c00e7806e09c (patch) | |
| tree | 26cc6bf438ff233a28e2eeedb62fa6c4895a93be /app | |
| parent | 13ba35ebf2d753ca52ae7ce321a0c8ffb221cf93 (diff) | |
| parent | 6ae4747673aacce567ad17b16a6f957e038452c1 (diff) | |
| download | gitlab-ce-128cb03bc861580f7bbe3724bf65c00e7806e09c.tar.gz | |
Merge branch 'rc/use-existing-url-helper' into 'master'
Replace ci_status_path with pipeline_path
See merge request gitlab-org/gitlab-ce!15369
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/ci_status_helper.rb | 5 | ||||
| -rw-r--r-- | app/views/admin/runners/show.html.haml | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb index 4dd573c61f1..636316da80a 100644 --- a/app/helpers/ci_status_helper.rb +++ b/app/helpers/ci_status_helper.rb @@ -6,11 +6,6 @@ # See 'detailed_status?` method and `Gitlab::Ci::Status` module. # module CiStatusHelper - def ci_status_path(pipeline) - project = pipeline.project - project_pipeline_path(project, pipeline) - end - def ci_label_for_status(status) if detailed_status?(status) return status.label diff --git a/app/views/admin/runners/show.html.haml b/app/views/admin/runners/show.html.haml index df2bf27be9d..6d8fad0eb8d 100644 --- a/app/views/admin/runners/show.html.haml +++ b/app/views/admin/runners/show.html.haml @@ -99,7 +99,7 @@ %td.build-link - if project - = link_to ci_status_path(build.pipeline) do + = link_to pipeline_path(build.pipeline) do %strong= build.pipeline.short_sha %td.timestamp |