Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/usage/metrics/instrumentations/count_bulk_imports_entities_metric.rb')
-rw-r--r--lib/gitlab/usage/metrics/instrumentations/count_bulk_imports_entities_metric.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/gitlab/usage/metrics/instrumentations/count_bulk_imports_entities_metric.rb b/lib/gitlab/usage/metrics/instrumentations/count_bulk_imports_entities_metric.rb
index c0d53b1b21a..67dc1455b23 100644
--- a/lib/gitlab/usage/metrics/instrumentations/count_bulk_imports_entities_metric.rb
+++ b/lib/gitlab/usage/metrics/instrumentations/count_bulk_imports_entities_metric.rb
@@ -20,15 +20,20 @@ module Gitlab
private
def relation
- return super.where(source_type: source_type) if source_type.present? # rubocop: disable CodeReuse/ActiveRecord
-
- super
+ scope = super
+ scope = scope.where(source_type: source_type) if source_type.present?
+ scope = scope.where(status: status) if status.present?
+ scope
end
def source_type
options[:source_type].to_s
end
+ def status
+ options[:status]
+ end
+
def allowed_source_types
BulkImports::Entity.source_types.keys.map(&:to_s)
end