Commit d54f05da authored by Fatih Acet's avatar Fatih Acet

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)
![Screen_Shot_2016-09-14_at_12.32.41_PM](/uploads/24f8d817481ba8f711c127bf143649ba/Screen_Shot_2016-09-14_at_12.32.41_PM.png)

#### What are the relevant issue numbers?
Closes  #21925

See merge request !6338
parents 1038ef54 019afb60
...@@ -147,14 +147,37 @@ ...@@ -147,14 +147,37 @@
} }
.stage-cell { .stage-cell {
text-align: center; font-size: 0;
svg { svg {
height: 18px; height: 18px;
width: 18px; width: 18px;
position: relative;
z-index: 2;
vertical-align: middle; vertical-align: middle;
overflow: visible; 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, .duration,
......
...@@ -36,16 +36,14 @@ ...@@ -36,16 +36,14 @@
- stages_status = pipeline.statuses.relevant.latest.stages_status - 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] - status = stages_status[stage]
- tooltip = "#{stage.titleize}: #{status || 'not found'}" - tooltip = "#{stage.titleize}: #{status || 'not found'}"
- if status - if status
.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 = 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) = ci_icon_for_status(status)
- else
.light.has-tooltip{ title: tooltip }
\-
%td %td
- if pipeline.duration - if pipeline.duration
......
...@@ -47,13 +47,7 @@ ...@@ -47,13 +47,7 @@
%tbody %tbody
%th Status %th Status
%th Commit %th Commit
- stages.each do |stage| %th Stages
%th.stage
- if stage.titleize.length > 12
%span.has-tooltip{ title: "#{stage.titleize}" }
= stage.titleize
- else
= stage.titleize
%th %th
%th %th
= render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment