Commit 099aa124 authored by James Lopez's avatar James Lopez

fix plan stage issue and some spec failures

parent 3f681f4c
...@@ -15,7 +15,9 @@ module Gitlab ...@@ -15,7 +15,9 @@ module Gitlab
end end
def event 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 end
def events def events
......
...@@ -47,7 +47,11 @@ module Gitlab ...@@ -47,7 +47,11 @@ module Gitlab
end end
def order 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 end
# Join table with a row for every <issue,merge_request> pair (where the merge request # Join table with a row for every <issue,merge_request> pair (where the merge request
......
...@@ -10,7 +10,7 @@ module Gitlab ...@@ -10,7 +10,7 @@ module Gitlab
end end
def stage def stage
:code :plan
end end
def description def description
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment