Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 10 insertions, 3 deletions

diff --git a/lib/gitlab/cycle_analytics/summary/deploy.rb b/lib/gitlab/cycle_analytics/summary/deploy.rb
index 5125c8e64ee..aaa2554dbfa 100644
--- a/lib/gitlab/cycle_analytics/summary/deploy.rb
+++ b/lib/gitlab/cycle_analytics/summary/deploy.rb
@@ -15,9 +15,16 @@ module Gitlab
         private
 
         def deployments_count
-          query = @project.deployments.success.where("created_at >= ?", @from)
-          query = query.where("created_at <= ?", @to) if @to
-          query.count
+          if Feature.enabled?(:query_deploymenys_via_finished_at_in_vsa, default_enabled: :yaml)
+            DeploymentsFinder
+              .new(project: @project, finished_after: @from, finished_before: @to, status: :success)
+              .execute
+              .count
+          else
+            query = @project.deployments.success.where("created_at >= ?", @from)
+            query = query.where("created_at <= ?", @to) if @to
+            query.count
+          end
         end
       end
     end