Merge branch '30469-convdev-index' of gitlab.com:gitlab-org/gitlab-ce into 30469-convdev-index

app/models/conversational_development_index/idea_to_production_step.rb

@@ -9,9 +9,9 @@ module ConversationalDevelopmentIndex
     end
 
     def percentage_score
-      sum = features.map do |feature|
+      sum = features.sum do |feature|
         metric.percentage_score(feature)
-      end.inject(:+)
+      end
 
       sum / features.size.to_f
     end

app/presenters/conversational_development_index/metric_presenter.rb

@@ -138,7 +138,7 @@ module ConversationalDevelopmentIndex
     end
 
     def average_percentage_score
-      cards.map(&:percentage_score).inject(:+) / cards.size.to_f
+      cards.sum(&:percentage_score) / cards.size.to_f
     end
   end
 end

app/views/admin/conversational_development_index/_callout.html.haml

@@ -8,6 +8,6 @@
       %h4
         Introducing Your Conversational Development Index
       %p
-        Your Conversational Development Index gives an overview of how you are using GitLab from a feature perspective. View how they compare with other organizations, discover features your are not using, and learn best practices through blog posts and white papers.
+        Your Conversational Development Index gives an overview of how you are using GitLab from a feature perspective. View how you compare with other organizations, discover features you are not using, and learn best practices through blog posts and white papers.
     .svg-container.convdev
       = custom_icon('convdev_overview')