diff options
author | James Lopez <james@jameslopez.es> | 2016-11-23 13:28:28 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-01-17 13:32:55 +0300 |
commit | a67311cb4c9f54af43d300fde5240f9a370193d1 (patch) | |
tree | 14b82a6181b6cd7a148eeda9d2e50002c798dd8e /app/controllers/projects/cycle_analytics | |
parent | 02e1e4819234662faddd7d8eb5c54d9bfdf9e7e6 (diff) |
Fix other spec failures
Diffstat (limited to 'app/controllers/projects/cycle_analytics')
-rw-r--r-- | app/controllers/projects/cycle_analytics/events_controller.rb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/app/controllers/projects/cycle_analytics/events_controller.rb b/app/controllers/projects/cycle_analytics/events_controller.rb index 5e9524b15db..e571e1dfce2 100644 --- a/app/controllers/projects/cycle_analytics/events_controller.rb +++ b/app/controllers/projects/cycle_analytics/events_controller.rb @@ -9,46 +9,46 @@ module Projects before_action :authorize_read_merge_request!, only: [:code, :review] def issue - render_events(events.issue_events) + render_events(cycle_analytics.events_for(:issue)) end def plan - render_events(events.plan_events) + render_events(cycle_analytics.events_for(:plan)) end def code - render_events(events.code_events) + render_events(cycle_analytics.events_for(:code)) end def test - options[:branch] = events_params[:branch_name] + options(events_params)[:branch] = events_params[:branch_name] - render_events(events.test_events) + render_events(cycle_analytics.events_for(:test)) end def review - render_events(events.review_events) + render_events(cycle_analytics.events_for(:review)) end def staging - render_events(events.staging_events) + render_events(cycle_analytics.events_for(:staging)) end def production - render_events(events.production_events) + render_events(cycle_analytics.events_for(:production)) end private - - def render_events(events_list) + + def render_events(events) respond_to do |format| format.html - format.json { render json: { events: events_list } } + format.json { render json: { events: events } } end end - def events - @events ||= Gitlab::CycleAnalytics::Events.new(project: project, options: options) + def cycle_analytics + @cycle_analytics ||= ::CycleAnalytics.new(project, options: options(events_params)) end def events_params |