Add latest changes from gitlab-org/gitlab@13-3-stable-ee

3 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/cycle_analytics/base_event_fetcher.rb b/lib/gitlab/cycle_analytics/base_event_fetcher.rb
index 07ae430c45e..6c6dd90e450 100644
--- a/lib/gitlab/cycle_analytics/base_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/base_event_fetcher.rb
@@ -6,7 +6,7 @@ module Gitlab
       include BaseQuery
       include GroupProjectsProvider
 
-      attr_reader :projections, :query, :stage, :order, :options
+      attr_reader :projections, :query, :stage, :options
 
       MAX_EVENTS = 50
 
diff --git a/lib/gitlab/cycle_analytics/summary/value.rb b/lib/gitlab/cycle_analytics/summary/value.rb
index e443e037517..36306fa7c45 100644
--- a/lib/gitlab/cycle_analytics/summary/value.rb
+++ b/lib/gitlab/cycle_analytics/summary/value.rb
@@ -34,7 +34,7 @@ module Gitlab
           end
 
           def to_s
-            value.zero? ? '0' : value.to_s
+            value == 0 ? '0' : value.to_s
           end
 
           def to_i
diff --git a/lib/gitlab/cycle_analytics/summary_helper.rb b/lib/gitlab/cycle_analytics/summary_helper.rb
index 3cf9f463024..11e48679a40 100644
--- a/lib/gitlab/cycle_analytics/summary_helper.rb
+++ b/lib/gitlab/cycle_analytics/summary_helper.rb
@@ -4,7 +4,7 @@ module Gitlab
   module CycleAnalytics
     module SummaryHelper
       def frequency(count, from, to)
-        return Summary::Value::None.new if count.zero?
+        return Summary::Value::None.new if count == 0
 
         freq = (count / days(from, to)).round(1)