diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-09-16 08:24:46 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-16 08:24:46 +0000 |
| commit | d54f05dac63d580d4451a954dd5593a065a05a3c (patch) | |
| tree | a11409c82fa32ddc77bd05f38eb57fa057d5b412 | |
| parent | 1038ef54d0405ae08eb3f413f936197f0775987b (diff) | |
| parent | 019afb605342aa55b292809efd6df62390372a5a (diff) | |
| download | gitlab-ce-d54f05dac63d580d4451a954dd5593a065a05a3c.tar.gz | |
Merge branch 'ci-stages' into 'master'
CI stages
#### What does this MR do?
Removes individual columns for each stage, consolidating them into one `Stages` column
#### Screenshots (if relevant)
#### What are the relevant issue numbers?
Closes #21925
See merge request !6338
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 25 | ||||
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 12 | ||||
| -rw-r--r-- | app/views/projects/pipelines/index.html.haml | 8 |
3 files changed, 30 insertions, 15 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index cc71b8eb045..1b4d12d3053 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -147,14 +147,37 @@ } .stage-cell { - text-align: center; + font-size: 0; svg { height: 18px; width: 18px; + position: relative; + z-index: 2; vertical-align: middle; overflow: visible; } + + .stage-container { + display: inline-block; + position: relative; + margin-right: 6px; + + .tooltip { + white-space: nowrap; + } + + &:not(:last-child) { + &::after { + content: ''; + width: 8px; + position: absolute;; + right: -7px; + bottom: 8px; + border-bottom: 2px solid $border-color; + } + } + } } .duration, diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index bb9493f5158..6391c67021b 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -36,16 +36,14 @@ - stages_status = pipeline.statuses.relevant.latest.stages_status - - stages.each do |stage| - %td.stage-cell + %td.stage-cell + - stages.each do |stage| - status = stages_status[stage] - tooltip = "#{stage.titleize}: #{status || 'not found'}" - if status - = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status}", title: tooltip do - = ci_icon_for_status(status) - - else - .light.has-tooltip{ title: tooltip } - \- + .stage-container + = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status}", title: tooltip do + = ci_icon_for_status(status) %td - if pipeline.duration diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml index 4d957e0d890..faf28db68d1 100644 --- a/app/views/projects/pipelines/index.html.haml +++ b/app/views/projects/pipelines/index.html.haml @@ -47,13 +47,7 @@ %tbody %th Status %th Commit - - stages.each do |stage| - %th.stage - - if stage.titleize.length > 12 - %span.has-tooltip{ title: "#{stage.titleize}" } - = stage.titleize - - else - = stage.titleize + %th Stages %th %th = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages |