summaryrefslogtreecommitdiff
path: root/lib/gitlab/cycle_analytics
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-11-15 11:36:39 +0100
committerJames Lopez <james@jameslopez.es>2016-11-17 08:22:58 +0100
commit8743e59f78cd8f8701460796dcc06854281f3f73 (patch)
treed539fff96a88a8ea33f1a9ab62faffc678dd22d8 /lib/gitlab/cycle_analytics
parentf5600997512f1068cdc36ad7d086e7447dbc6d9d (diff)
downloadgitlab-ce-8743e59f78cd8f8701460796dcc06854281f3f73.tar.gz
get all stages to use serlalizers - apart from plan - WIP
Diffstat (limited to 'lib/gitlab/cycle_analytics')
-rw-r--r--lib/gitlab/cycle_analytics/events.rb4
-rw-r--r--lib/gitlab/cycle_analytics/query_config.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/cycle_analytics/events.rb b/lib/gitlab/cycle_analytics/events.rb
index 3b397bab178..69688a2a0ca 100644
--- a/lib/gitlab/cycle_analytics/events.rb
+++ b/lib/gitlab/cycle_analytics/events.rb
@@ -34,7 +34,7 @@ module Gitlab
end
def review_events
- @fetcher.fetch(stage: :review).map { |event| parse_event(event) }
+ @fetcher.fetch(stage: :review).map { |event| parse_event(event, entity: :merge_request) }
end
def staging_events
@@ -44,7 +44,7 @@ module Gitlab
end
def production_events
- @fetcher.fetch(stage: :production).each { |event| parse_event(event) }
+ @fetcher.fetch(stage: :production).map { |event| parse_event(event) }
end
private
diff --git a/lib/gitlab/cycle_analytics/query_config.rb b/lib/gitlab/cycle_analytics/query_config.rb
index d077a3e1a14..a18c263ba53 100644
--- a/lib/gitlab/cycle_analytics/query_config.rb
+++ b/lib/gitlab/cycle_analytics/query_config.rb
@@ -67,7 +67,7 @@ module Gitlab
projections: [mr_table[:title],
mr_table[:iid],
mr_table[:id],
- mr_table[:created_at].as('opened_at'),
+ mr_table[:created_at],
mr_table[:state],
mr_table[:author_id]]
}