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
7351c269
Commit
7351c269
authored
Sep 06, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sort by database, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14991226
and
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6084#note_14994233
parent
3a68c989
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
pipeline_duration.rb
lib/gitlab/ci/pipeline_duration.rb
+4
-2
pipeline_duration_spec.rb
spec/lib/gitlab/ci/pipeline_duration_spec.rb
+1
-1
No files found.
lib/gitlab/ci/pipeline_duration.rb
View file @
7351c269
...
...
@@ -88,7 +88,8 @@ module Gitlab
def
from_pipeline
(
pipeline
)
status
=
%w[success failed running canceled]
builds
=
pipeline
.
builds
.
latest
.
where
(
status:
status
)
builds
=
pipeline
.
builds
.
latest
.
where
(
status:
status
).
where
.
not
(
started_at:
nil
).
order
(
:started_at
)
from_builds
(
builds
,
:started_at
,
:finished_at
)
end
...
...
@@ -101,8 +102,9 @@ module Gitlab
from_periods
(
periods
)
end
# periods should be sorted by `first`
def
from_periods
(
periods
)
process_duration
(
process_periods
(
periods
.
sort_by
(
&
:first
)
))
process_duration
(
process_periods
(
periods
))
end
private
...
...
spec/lib/gitlab/ci/pipeline_duration_spec.rb
View file @
7351c269
...
...
@@ -110,6 +110,6 @@ describe Gitlab::Ci::PipelineDuration do
Gitlab
::
Ci
::
PipelineDuration
::
Period
.
new
(
first
,
last
)
end
Gitlab
::
Ci
::
PipelineDuration
.
from_periods
(
periods
)
Gitlab
::
Ci
::
PipelineDuration
.
from_periods
(
periods
.
sort_by
(
&
:first
)
)
end
end
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