Commit 7ce7a8a3 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch...

Merge branch '229222-multiple-specs-failing-due-to-undefined-method-active-for-ee-jiraservice-module' into 'master'

Ensure we call the top-level ::JiraService class in ee/lib/ee/gitlab/usage_data.rb

Closes #229222

See merge request gitlab-org/gitlab!36986
parents c1477461 1e3ac47b
......@@ -352,7 +352,7 @@ module EE
min_id = JiraTrackerData.where(issues_enabled: true).minimum(:service_id)
max_id = JiraTrackerData.where(issues_enabled: true).maximum(:service_id)
count(JiraService.active.includes(:jira_tracker_data).where(jira_tracker_data: { issues_enabled: true }), start: min_id, finish: max_id)
count(::JiraService.active.includes(:jira_tracker_data).where(jira_tracker_data: { issues_enabled: true }), start: min_id, finish: max_id)
end
# rubocop:enable CodeReuse/ActiveRecord
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment