diff options
author | James Lopez <james@jameslopez.es> | 2016-11-22 12:01:21 +0100 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-01-17 11:32:54 +0100 |
commit | 8639ea1b0315045c0e4a5ad8d6419903507850c3 (patch) | |
tree | d2b07fe5ed747595e924cfe4b3eb8b98d6d8ee29 /app/models | |
parent | fc6f8f20562ad761c034ffff076d329a3e9e8f4d (diff) | |
download | gitlab-ce-8639ea1b0315045c0e4a5ad8d6419903507850c3.tar.gz |
fix bad merge
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/cycle_analytics.rb | 8 |
1 files 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) |