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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
099aa124
Commit
099aa124
authored
Dec 05, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix plan stage issue and some spec failures
parent
3f681f4c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
lib/gitlab/cycle_analytics/base_stage.rb
lib/gitlab/cycle_analytics/base_stage.rb
+3
-1
lib/gitlab/cycle_analytics/metrics_fetcher.rb
lib/gitlab/cycle_analytics/metrics_fetcher.rb
+5
-1
lib/gitlab/cycle_analytics/plan_stage.rb
lib/gitlab/cycle_analytics/plan_stage.rb
+1
-1
No files found.
lib/gitlab/cycle_analytics/base_stage.rb
View file @
099aa124
...
...
@@ -15,7 +15,9 @@ module Gitlab
end
def
event
@event
||=
Gitlab
::
CycleAnalytics
::
Event
[
stage
].
new
(
fetcher:
@fetcher
,
options:
@options
,
stage:
stage
)
@event
||=
Gitlab
::
CycleAnalytics
::
Event
[
stage
].
new
(
fetcher:
@fetcher
,
options:
@options
,
stage:
stage
)
end
def
events
...
...
lib/gitlab/cycle_analytics/metrics_fetcher.rb
View file @
099aa124
...
...
@@ -47,7 +47,11 @@ module Gitlab
end
def
order
@stage
.
event
.
order
||
@stage
.
start_time_attrs
.
is_a?
(
Array
)
?
@stage
.
start_time_attrs
.
first
:
@stage
.
start_time_attrs
@stage
.
event
.
order
||
default_order
end
def
default_order
@stage
.
start_time_attrs
.
is_a?
(
Array
)
?
@stage
.
start_time_attrs
.
first
:
@stage
.
start_time_attrs
end
# Join table with a row for every <issue,merge_request> pair (where the merge request
...
...
lib/gitlab/cycle_analytics/plan_stage.rb
View file @
099aa124
...
...
@@ -10,7 +10,7 @@ module Gitlab
end
def
stage
:
code
:
plan
end
def
description
...
...
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