Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
0983d01b
Commit
0983d01b
authored
Sep 09, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove stage names; connect stages in column
parent
1038ef54
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
15 deletions
+48
-15
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+24
-0
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+9
-8
app/views/projects/pipelines/index.html.haml
app/views/projects/pipelines/index.html.haml
+8
-7
app/views/shared/icons/_icon_stage_empty.svg
app/views/shared/icons/_icon_stage_empty.svg
+7
-0
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
0983d01b
...
@@ -155,6 +155,30 @@
...
@@ -155,6 +155,30 @@
vertical-align
:
middle
;
vertical-align
:
middle
;
overflow
:
visible
;
overflow
:
visible
;
}
}
.stage-container
{
display
:
inline-block
;
position
:
relative
;
margin-right
:
6px
;
&
:not
(
:last-child
)
{
&
:
:
after
{
content
:
''
;
height
:
20px
;
width
:
9px
;
position
:
absolute
;;
right
:
-9px
;
bottom
:
36%
;
border-bottom
:
2px
solid
$white-dark
;
}
}
}
.stage-empty
{
g
{
fill
:
$white-normal
;
}
}
}
}
.duration
,
.duration
,
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
0983d01b
...
@@ -36,16 +36,17 @@
...
@@ -36,16 +36,17 @@
-
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'
}
"
.stage-container
-
if
status
-
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
=
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
-
else
.light.has-tooltip
{
title:
tooltip
}
.light.has-tooltip
{
title:
tooltip
}
\-
=
custom_icon
(
'icon_stage_empty'
)
%td
%td
-
if
pipeline
.
duration
-
if
pipeline
.
duration
...
...
app/views/projects/pipelines/index.html.haml
View file @
0983d01b
...
@@ -47,13 +47,14 @@
...
@@ -47,13 +47,14 @@
%tbody
%tbody
%th
Status
%th
Status
%th
Commit
%th
Commit
-
stages
.
each
do
|
stage
|
%th
Stages
%th
.stage
-# - stages.each do |stage|
-
if
stage
.
titleize
.
length
>
12
-# %th.stage
%span
.has-tooltip
{
title:
"#{stage.titleize}"
}
-# - if stage.titleize.length > 12
=
stage
.
titleize
-# %span.has-tooltip{ title: "#{stage.titleize}" }
-
else
-# = 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
...
...
app/views/shared/icons/_icon_stage_empty.svg
0 → 100644
View file @
0983d01b
<svg
width=
"14px"
class=
"stage-empty"
height=
"14px"
viewBox=
"0 0 14 14"
version=
"1.1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<g
id=
"Page-1"
stroke=
"none"
stroke-width=
"1"
fill=
"none"
fill-rule=
"evenodd"
>
<g
id=
"_icon_status_created"
fill=
"#000000"
>
<path
d=
"M12.5,7 C12.5,4 10,1.5 7,1.5 C4,1.5 1.5,4 1.5,7 C1.5,10 4,12.5 7,12.5 C10,12.5 12.5,10 12.5,7 L12.5,7 L12.5,7 Z M0,7 C0,3.1 3.1,0 7,0 C10.9,0 14,3.1 14,7 C14,10.9 10.9,14 7,14 C3.1,14 0,10.9 0,7 L0,7 L0,7 Z"
id=
"Shape"
></path>
</g>
</g>
</svg>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment