diff options
| author | James Lopez <james@jameslopez.es> | 2016-11-17 15:00:01 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-11-17 15:00:01 +0100 |
| commit | 37a35050191b41cb5150d14292887d2fe88dad37 (patch) | |
| tree | cfa22942a5bcd7b21949b886eee357961c597265 | |
| parent | af80fcb477d13c240d8f58abab7d2b88a11ca7b5 (diff) | |
| download | gitlab-ce-37a35050191b41cb5150d14292887d2fe88dad37.tar.gz | |
fix integration spec
| -rw-r--r-- | app/controllers/projects/cycle_analytics/events_controller.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/cycle_analytics/issue_event.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/cycle_analytics/events_controller.rb b/app/controllers/projects/cycle_analytics/events_controller.rb index 81b59b4804b..7b6214d71b5 100644 --- a/app/controllers/projects/cycle_analytics/events_controller.rb +++ b/app/controllers/projects/cycle_analytics/events_controller.rb @@ -19,7 +19,7 @@ module Projects end def test - @options[:branch] = events_params[:branch_name] + options[:branch] = events_params[:branch_name] render_events(events.test_events) end diff --git a/lib/gitlab/cycle_analytics/issue_event.rb b/lib/gitlab/cycle_analytics/issue_event.rb index 9ae2c481158..9cfcdc9b20e 100644 --- a/lib/gitlab/cycle_analytics/issue_event.rb +++ b/lib/gitlab/cycle_analytics/issue_event.rb @@ -13,7 +13,7 @@ module Gitlab issue_table[:created_at], issue_table[:author_id]] - def self.serialize(event, query)# + def self.serialize(event, query) event['author'] = User.find(event.delete('author_id')) AnalyticsIssueSerializer.new(project: query.project).represent(event).as_json |