Add latest changes from gitlab-org/gitlab@master

4 files changed, 15 insertions, 3 deletions

diff --git a/lib/gitlab/cycle_analytics/summary/commit.rb b/lib/gitlab/cycle_analytics/summary/commit.rb
index 1f426b81800..1dc9d5de966 100644
--- a/lib/gitlab/cycle_analytics/summary/commit.rb
+++ b/lib/gitlab/cycle_analytics/summary/commit.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Summary
       class Commit < Base
         def title
-          n_('Commit', 'Commits', value)
+          n_('Commit', 'Commits', value.to_i)
         end
 
         def value
diff --git a/lib/gitlab/cycle_analytics/summary/deploy.rb b/lib/gitlab/cycle_analytics/summary/deploy.rb
index 8544ea1a91e..5125c8e64ee 100644
--- a/lib/gitlab/cycle_analytics/summary/deploy.rb
+++ b/lib/gitlab/cycle_analytics/summary/deploy.rb
@@ -5,7 +5,7 @@ module Gitlab
     module Summary
       class Deploy < Base
         def title
-          n_('Deploy', 'Deploys', value)
+          n_('Deploy', 'Deploys', value.to_i)
         end
 
         def value
diff --git a/lib/gitlab/cycle_analytics/summary/issue.rb b/lib/gitlab/cycle_analytics/summary/issue.rb
index ce7788590b9..462fd4c2d3d 100644
--- a/lib/gitlab/cycle_analytics/summary/issue.rb
+++ b/lib/gitlab/cycle_analytics/summary/issue.rb
@@ -12,7 +12,7 @@ module Gitlab
         end
 
         def title
-          n_('New Issue', 'New Issues', value)
+          n_('New Issue', 'New Issues', value.to_i)
         end
 
         def value
diff --git a/lib/gitlab/cycle_analytics/summary/value.rb b/lib/gitlab/cycle_analytics/summary/value.rb
index ce32132e048..e443e037517 100644
--- a/lib/gitlab/cycle_analytics/summary/value.rb
+++ b/lib/gitlab/cycle_analytics/summary/value.rb
@@ -15,6 +15,14 @@ module Gitlab
         end
 
         class None < self
+          def raw_value
+            0
+          end
+
+          def to_i
+            raw_value
+          end
+
           def to_s
             '-'
           end
@@ -28,6 +36,10 @@ module Gitlab
           def to_s
             value.zero? ? '0' : value.to_s
           end
+
+          def to_i
+            raw_value
+          end
         end
 
         class PrettyNumeric < Numeric