diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/cycle_analytics/base_query.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/usage_data.rb | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/gitlab/cycle_analytics/base_query.rb b/lib/gitlab/cycle_analytics/base_query.rb index cd3d19db28e..b9075047487 100644 --- a/lib/gitlab/cycle_analytics/base_query.rb +++ b/lib/gitlab/cycle_analytics/base_query.rb @@ -8,14 +8,14 @@ module Gitlab private def base_query - @base_query ||= stage_query([@project.id]) + @base_query ||= stage_query([@project.id]) # rubocop:disable Gitlab/ModuleWithInstanceVariables end def stage_query(project_ids) 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])) .project(issue_table[:project_id].as("project_id")) - .where(issue_table[:project_id].in(project_ids)) # rubocop:disable Gitlab/ModuleWithInstanceVariables + .where(issue_table[:project_id].in(project_ids)) .where(issue_table[:created_at].gteq(@options[:from])) # rubocop:disable Gitlab/ModuleWithInstanceVariables # Load merge_requests diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 1fa000e933c..dae0e20e156 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -73,6 +73,9 @@ module Gitlab end def cycle_analytics_usage_data + # We only want to generate this data for instances that use PostgreSQL + return {} if Gitlab::Database.mysql? + projects = Project.sorted_by_activity.limit(Gitlab::CycleAnalytics::UsageData::PROJECTS_LIMIT) Gitlab::CycleAnalytics::UsageData.new(projects, { from: 7.days.ago }).to_json |