Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch

# Conflicts:
#	app/models/project_services/prometheus_service.rb
#	app/views/projects/services/_form.html.haml

1 files changed, 21 insertions, 0 deletions

diff --git a/app/models/conversational_development_index/metric.rb b/app/models/conversational_development_index/metric.rb
new file mode 100644
index 00000000000..f42f516f99a
--- /dev/null
+++ b/app/models/conversational_development_index/metric.rb
@@ -0,0 +1,21 @@
+module ConversationalDevelopmentIndex
+  class Metric < ActiveRecord::Base
+    include Presentable
+
+    self.table_name = 'conversational_development_index_metrics'
+
+    def instance_score(feature)
+      self["instance_#{feature}"]
+    end
+
+    def leader_score(feature)
+      self["leader_#{feature}"]
+    end
+
+    def percentage_score(feature)
+      return 100 if leader_score(feature).zero?
+
+      100 * instance_score(feature) / leader_score(feature)
+    end
+  end
+end