From 8639ea1b0315045c0e4a5ad8d6419903507850c3 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Tue, 22 Nov 2016 12:01:21 +0100 Subject: [PATCH] fix bad merge --- app/models/cycle_analytics.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/cycle_analytics.rb b/app/models/cycle_analytics.rb index e0f9690f1f4..9681d34f2d1 100644 --- a/app/models/cycle_analytics.rb +++ b/app/models/cycle_analytics.rb @@ -12,15 +12,17 @@ class CycleAnalytics def method_missing(method_sym, *arguments, &block) classify_stage(method_sym).new(project: @project, options: @options, stage: method_sym) + end + def permissions(user:) Gitlab::CycleAnalytics::Permissions.get(user: user, project: @project) end def issue @fetcher.calculate_metric(:issue, - Issue.arel_table[:created_at], - [Issue::Metrics.arel_table[:first_associated_with_milestone_at], - Issue::Metrics.arel_table[:first_added_to_board_at]]) + Issue.arel_table[:created_at], + [Issue::Metrics.arel_table[:first_associated_with_milestone_at], + Issue::Metrics.arel_table[:first_added_to_board_at]]) end def classify_stage(method_sym)