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
dcb7d414
Commit
dcb7d414
authored
8 years ago
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Connect top level tests to each other
parent
3b4fb0bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
19 deletions
+75
-19
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+50
-0
app/views/projects/commit/_pipeline.html.haml
app/views/projects/commit/_pipeline.html.haml
+25
-19
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
dcb7d414
...
...
@@ -231,7 +231,57 @@
}
// Pipeline visualization
.pipeline-visualization
{
position
:
relative
;
}
.stage-column
{
display
:
inline-block
;
vertical-align
:
top
;
margin-right
:
40px
;
.stage-name
{
margin-bottom
:
15px
;
font-weight
:
bold
;
}
.builds-container
{
}
.build
{
border
:
1px
solid
$border-color
;
position
:
relative
;
padding
:
6px
10px
;
border-radius
:
30px
;
width
:
150px
;
// TODO truncate text within .build div; not on build div itself
// white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
margin-bottom
:
10px
;
svg
{
position
:
relative
;
top
:
2px
;
margin-right
:
5px
;
}
&
:first-child
{
&
:
:
after
,
&::
before
{
content
:
''
;
position
:
absolute
;
top
:
50%
;
right
:
-44px
;
border-top
:
1px
solid
$border-color
;
width
:
44px
;
height
:
1px
;
}
}
&
:first-child::before
,
&
:last-child::after
{
border
:
0
none
;
}
}
}
This diff is collapsed.
Click to expand it.
app/views/projects/commit/_pipeline.html.haml
View file @
dcb7d414
.row-content-block.build-content.middle-block
.row-content-block.white
.pipeline-visualization
-
pipeline
.
statuses
.
stages
.
each
do
|
stage
|
-
statuses
=
pipeline
.
statuses
.
where
(
stage:
stage
)
-
status
=
statuses
.
latest
.
status
.stage-column
%strong
.stage-name
%a
{
name:
stage
}
-
if
stage
=
stage
.
titleize
-
statuses
.
each
do
|
status
|
%div
=
status
.
name
.builds-container
-
statuses
.
each
do
|
build
|
.build
%span
{
class:
"ci-status-link ci-status-icon-#{status}"
}
=
ci_icon_for_status
(
status
)
=
build
.
name
.row-content-block.build-content.middle-block
.pull-right
-
if
can?
(
current_user
,
:update_pipeline
,
pipeline
.
project
)
-
if
pipeline
.
builds
.
latest
.
failed
.
any?
(
&
:retryable?
)
...
...
@@ -46,17 +52,17 @@
-
if
pipeline
.
project
.
builds_enabled?
&&
!
pipeline
.
ci_yaml_file
.bs-callout.bs-callout-warning
\.gitlab-ci.yml not found in this commit
.table-holder.pipeline-holder
%table
.table.builds.pipeline
%thead
%tr
%th
Status
%th
Build ID
%th
Name
%th
-
if
pipeline
.
project
.
build_coverage_enabled?
%th
Coverage
%th
-
pipeline
.
statuses
.
stages
.
each
do
|
stage
|
=
render
'projects/commit/ci_stage'
,
stage:
stage
,
statuses:
pipeline
.
statuses
.
where
(
stage:
stage
)
-#
-#
.table-holder.pipeline-holder
-#
%table.table.builds.pipeline
-#
%thead
-#
%tr
-#
%th Status
-#
%th Build ID
-#
%th Name
-#
%th
-#
- if pipeline.project.build_coverage_enabled?
-#
%th Coverage
-#
%th
-#
- pipeline.statuses.stages.each do |stage|
-#
= render 'projects/commit/ci_stage', stage: stage, statuses: pipeline.statuses.where(stage: stage)
This diff is collapsed.
Click to expand it.
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