diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 17:40:46 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 17:40:46 -0600 |
| commit | c1c74e608625eab143f44ef6940e64cca6af0a0c (patch) | |
| tree | c5ca4a8a39946f54878a3ecde6b4adcda11d2d9b /lib/gitlab/cycle_analytics/base_query.rb | |
| parent | cecea7529fb37893af6bf514a53e239a3be1eea6 (diff) | |
| parent | 8900b23eab6abd5a6c01278fa0da18d5bed98491 (diff) | |
| download | gitlab-ce-c1c74e608625eab143f44ef6940e64cca6af0a0c.tar.gz | |
Merge branch 'master' into fix-no-template
Diffstat (limited to 'lib/gitlab/cycle_analytics/base_query.rb')
| -rw-r--r-- | lib/gitlab/cycle_analytics/base_query.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/gitlab/cycle_analytics/base_query.rb b/lib/gitlab/cycle_analytics/base_query.rb index dcbdf9a64b0..8b3bc3e440d 100644 --- a/lib/gitlab/cycle_analytics/base_query.rb +++ b/lib/gitlab/cycle_analytics/base_query.rb @@ -15,7 +15,6 @@ module Gitlab query = mr_closing_issues_table.join(issue_table).on(issue_table[:id].eq(mr_closing_issues_table[:issue_id])) .join(issue_metrics_table).on(issue_table[:id].eq(issue_metrics_table[:issue_id])) .where(issue_table[:project_id].eq(@project.id)) # rubocop:disable Gitlab/ModuleWithInstanceVariables - .where(issue_table[:deleted_at].eq(nil)) .where(issue_table[:created_at].gteq(@options[:from])) # rubocop:disable Gitlab/ModuleWithInstanceVariables # Load merge_requests |