Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 10 deletions

diff --git a/lib/gitlab/cycle_analytics/summary/deploy.rb b/lib/gitlab/cycle_analytics/summary/deploy.rb
index aaa2554dbfa..c247ef0d2a7 100644
--- a/lib/gitlab/cycle_analytics/summary/deploy.rb
+++ b/lib/gitlab/cycle_analytics/summary/deploy.rb
@@ -15,16 +15,10 @@ module Gitlab
         private
 
         def deployments_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
+          DeploymentsFinder
+            .new(project: @project, finished_after: @from, finished_before: @to, status: :success)
+            .execute
+            .count
         end
       end
     end