Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/cycle_analytics/summary/deploy.rb b/lib/gitlab/cycle_analytics/summary/deploy.rb
index 3b56dc2a7bc..0691f3cd131 100644
--- a/lib/gitlab/cycle_analytics/summary/deploy.rb
+++ b/lib/gitlab/cycle_analytics/summary/deploy.rb
@@ -4,12 +4,18 @@ module Gitlab
   module CycleAnalytics
     module Summary
       class Deploy < Base
+        include Gitlab::Utils::StrongMemoize
+
         def title
           n_('Deploy', 'Deploys', value)
         end
 
         def value
-          @value ||= @project.deployments.where("created_at > ?", @from).count
+          strong_memoize(:value) do
+            query = @project.deployments.where("created_at >= ?", @from)
+            query = query.where("created_at <= ?", @to) if @to
+            query.count
+          end
         end
       end
     end