diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-14 15:34:22 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-14 15:34:22 +0300 |
| commit | 3e90aa1119fc4c77e92e6492f1906f252d90b64e (patch) | |
| tree | f228f7cecd3f1a488034e4155bcd40a38dd1411d /app/views/projects/ci | |
| parent | 3a90612660ab90225907ec6d79032905885c2507 (diff) | |
| parent | 6757aaa120c375f15e09f4c428286e5dc1d95f84 (diff) | |
Merge branch 'build-statuses' into 'master'
Detailed build statuses
## What does this MR do?
Implements detailed statuses for `Ci::Builds` and `CommitStatus`.
It also adds a new icon for manual build.
## Screenshots
## What are the relevant issue numbers?
See #24273, closes #22642
See merge request !7989
Diffstat (limited to 'app/views/projects/ci')
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 18b3b04154f..f1cb0201032 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -9,10 +9,7 @@ %tr.build.commit{class: ('retried' if retried)} %td.status - - if can?(current_user, :read_build, build) - = ci_status_with_icon(build.status, namespace_project_build_url(build.project.namespace, build.project, build)) - - else - = ci_status_with_icon(build.status) + = render "ci/status/badge", status: build.detailed_status(current_user) %td.branch-commit - if can?(current_user, :read_build, build) diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index b58dceb58c9..3f05a21990f 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -1,13 +1,10 @@ - status = pipeline.status -- detailed_status = pipeline.detailed_status - show_commit = local_assigns.fetch(:show_commit, true) - show_branch = local_assigns.fetch(:show_branch, true) %tr.commit %td.commit-link - = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), class: "ci-status ci-#{detailed_status}" do - = ci_icon_for_status(detailed_status) - = ci_text_for_status(detailed_status) + = render 'ci/status/badge', status: pipeline.detailed_status(current_user) %td = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do |