BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
fee7992c
Commit
fee7992c
authored
Aug 17, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pipelines visualisation rendering
parent
ef767268
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
build.rb
app/models/ci/build.rb
+1
-1
pipeline.rb
app/models/ci/pipeline.rb
+4
-0
_pipeline.html.haml
app/views/projects/commit/_pipeline.html.haml
+10
-6
No files found.
app/models/ci/build.rb
View file @
fee7992c
...
...
@@ -102,7 +102,7 @@ module Ci
end
def
playable?
project
.
builds_enabled?
&&
commands
.
present?
&&
manual?
project
.
builds_enabled?
&&
commands
.
present?
&&
manual?
&&
skipped?
end
def
play
(
current_user
=
nil
)
...
...
app/models/ci/pipeline.rb
View file @
fee7992c
...
...
@@ -34,6 +34,10 @@ module Ci
CommitStatus
.
where
(
pipeline:
pluck
(
:id
)).
stages
end
def
stages
statuses
.
order
(
:stage_idx
).
latest
.
group_by
(
&
:stage
)
end
def
project_id
project
.
id
end
...
...
app/views/projects/commit/_pipeline.html.haml
View file @
fee7992c
.row-content-block.build-content.middle-block.pipeline-graph
.pipeline-visualization
%ul
.stage-column-list
-
pipeline
.
statuses
.
stages
.
each
do
|
stage
|
-
statuses
=
pipeline
.
statuses
.
where
(
stage:
stage
)
-
status
=
statuses
.
latest
.
status
-
stages
=
pipeline
.
statuses
.
latest
.
order
(
:stage_idx
).
group_by
(
&
:stage
)
-
stages
.
each
do
|
stage
,
builds
|
%li
.stage-column
.stage-name
%a
{
name:
stage
}
...
...
@@ -11,11 +10,16 @@
=
stage
.
titleize
.builds-container
%ul
-
statuse
s
.
each
do
|
build
|
-
build
s
.
each
do
|
build
|
%li
.build
.build-content
%span
{
class:
"ci-status-link ci-status-icon-#{status}"
}
=
ci_icon_for_status
(
status
)
%span
{
class:
"ci-status-link ci-status-icon-#{build.status}"
}
-
if
build
.
try
(
:playable?
)
=
link_to
play_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Play'
do
=
icon
(
'play'
)
-
else
=
link_to
namespace_project_build_url
(
build
.
project
.
namespace
,
build
.
project
,
build
)
do
=
ci_icon_for_status
(
build
.
status
)
=
build
.
name
.row-content-block.build-content.middle-block.pipeline-graph
...
...
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