fix plan stage issue and some spec failures
This commit is contained in:
parent
3f681f4cef
commit
099aa124eb
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -10,7 +10,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def stage
|
||||
:code
|
||||
:plan
|
||||
end
|
||||
|
||||
def description
|
||||
|
|
Loading…
Reference in New Issue