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
fa1105b1
Commit
fa1105b1
authored
Nov 15, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken pipeline rendering [ci skip]
parent
4e06818d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
12 deletions
+11
-12
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+6
-4
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+5
-8
No files found.
app/models/ci/pipeline.rb
View file @
fa1105b1
...
...
@@ -21,8 +21,6 @@ module Ci
after_create
:keep_around_commits
,
unless: :importing?
delegate
:stages
,
to: :statuses
state_machine
:status
,
initial: :created
do
event
:enqueue
do
transition
created: :pending
...
...
@@ -102,15 +100,19 @@ module Ci
where
.
not
(
duration:
nil
).
sum
(
:duration
)
end
def
stages
def
stages
_query
statuses
.
group
(
'stage'
).
select
(
:stage
)
.
order
(
'max(stage_idx)'
)
end
def
stages
self
.
stages_query
.
pluck
(
:stage
)
end
def
stages_with_statuses
status_sql
=
statuses
.
latest
.
where
(
'stage=sg.stage'
).
status_sql
stages_with_statuses
=
CommitStatus
.
from
(
self
.
stages
,
:sg
).
stages_with_statuses
=
CommitStatus
.
from
(
self
.
stages
_query
,
:sg
).
pluck
(
'sg.stage'
,
status_sql
)
stages_with_statuses
.
map
do
|
stage
|
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
fa1105b1
...
...
@@ -43,16 +43,13 @@
-
else
Cant find HEAD commit for this branch
-
stages_status
=
pipeline
.
statuses
.
latest
.
stages_status
%td
.stage-cell
-
pipeline
.
statuses
.
latest
.
stages_status
.
each
do
|
stage
|
-
name
=
stage
.
first
-
status
=
stage
.
last
-
tooltip
=
"
#{
name
.
titleize
}
:
#{
status
||
'not found'
}
"
-
if
status
-
pipeline
.
stages_with_statuses
.
each
do
|
stage
|
-
if
stage
.
status
-
tooltip
=
"
#{
stage
.
name
.
titleize
}
:
#{
stage
.
status
||
'not found'
}
"
.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
)
=
link_to
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
,
anchor:
stage
.
name
),
class:
"has-tooltip ci-status-icon-
#{
stage
.
status
}
"
,
title:
tooltip
do
=
ci_icon_for_status
(
sta
ge
.
sta
tus
)
%td
-
if
pipeline
.
duration
...
...
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