Commit 11d10612 authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'callsite_for_namespace_monthly_usage' into 'master'

Allow for_namespace_monthly_usage for cross-db query

See merge request gitlab-org/gitlab!72573
parents df9eb2d6 82aa52d4
...@@ -15,7 +15,7 @@ module Ci ...@@ -15,7 +15,7 @@ module Ci
where( where(
date: namespace_monthly_usage.date, date: namespace_monthly_usage.date,
project: namespace_monthly_usage.namespace.projects project: namespace_monthly_usage.namespace.projects
) ).allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/343301')
end end
def self.beginning_of_month(time = Time.current) def self.beginning_of_month(time = Time.current)
......
- "./ee/spec/features/ci/ci_minutes_spec.rb"
- "./ee/spec/features/merge_trains/two_merge_requests_on_train_spec.rb" - "./ee/spec/features/merge_trains/two_merge_requests_on_train_spec.rb"
- "./ee/spec/features/merge_trains/user_adds_merge_request_to_merge_train_spec.rb" - "./ee/spec/features/merge_trains/user_adds_merge_request_to_merge_train_spec.rb"
- "./ee/spec/finders/ee/namespaces/projects_finder_spec.rb" - "./ee/spec/finders/ee/namespaces/projects_finder_spec.rb"
......
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