diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-01 00:10:27 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-01 00:10:27 +0000 |
| commit | a149dffe2f221544ce239658e1e0fad06a2726a2 (patch) | |
| tree | 87b71776b0ce5084235b0a26c2acf0fa1c910eee /lib/gitlab/usage | |
| parent | 16776d7f4fdb0cef173fcebb189c53b5bc0ecd39 (diff) | |
| download | gitlab-ce-a149dffe2f221544ce239658e1e0fad06a2726a2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/usage')
| -rw-r--r-- | lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb b/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb index 8811dec49d8..c7cf6c57059 100644 --- a/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb +++ b/lib/gitlab/usage/metrics/instrumentations/distinct_count_projects_with_expiration_policy_metric.rb @@ -12,7 +12,11 @@ module Gitlab cache_start_and_finish_as :project_id - relation ->(options) { ::ContainerExpirationPolicy.where(enabled: options[:enabled]) } + relation ->(options) do + options.each_with_object(::ContainerExpirationPolicy.all) do |(key, value), ar_relation| + ar_relation.where!(key => value) + end + end end end end |