Add latest changes from gitlab-org/gitlab@master

7 files changed, 7 insertions, 7 deletions

diff --git a/app/controllers/instance_statistics/conversational_development_index_controller.rb b/app/controllers/instance_statistics/conversational_development_index_controller.rb
index 306c16d559c..f34347b4d22 100644
--- a/app/controllers/instance_statistics/conversational_development_index_controller.rb
+++ b/app/controllers/instance_statistics/conversational_development_index_controller.rb
@@ -3,7 +3,7 @@
 class InstanceStatistics::ConversationalDevelopmentIndexController < InstanceStatistics::ApplicationController
   # rubocop: disable CodeReuse/ActiveRecord
   def index
-    @metric = ConversationalDevelopmentIndex::Metric.order(:created_at).last&.present
+    @metric = DevOpsScore::Metric.order(:created_at).last&.present
   end
   # rubocop: enable CodeReuse/ActiveRecord
 end
diff --git a/app/helpers/conversational_development_index_helper.rb b/app/helpers/dev_ops_score_helper.rb
index 37e5bb325fb..9a673998149 100644
--- a/app/helpers/conversational_development_index_helper.rb
+++ b/app/helpers/dev_ops_score_helper.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ConversationalDevelopmentIndexHelper
+module DevOpsScoreHelper
   def score_level(score)
     if score < 33.33
       'low'
diff --git a/app/models/conversational_development_index/card.rb b/app/models/dev_ops_score/card.rb
index f9180bdd97b..b1894cf4138 100644
--- a/app/models/conversational_development_index/card.rb
+++ b/app/models/dev_ops_score/card.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ConversationalDevelopmentIndex
+module DevOpsScore
   class Card
     attr_accessor :metric, :title, :description, :feature, :blog, :docs
 
diff --git a/app/models/conversational_development_index/idea_to_production_step.rb b/app/models/dev_ops_score/idea_to_production_step.rb
index e78a734693c..d892793cf97 100644
--- a/app/models/conversational_development_index/idea_to_production_step.rb
+++ b/app/models/dev_ops_score/idea_to_production_step.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ConversationalDevelopmentIndex
+module DevOpsScore
   class IdeaToProductionStep
     attr_accessor :metric, :title, :features
 
diff --git a/app/models/conversational_development_index/metric.rb b/app/models/dev_ops_score/metric.rb
index b91123be87e..a9133128ce9 100644
--- a/app/models/conversational_development_index/metric.rb
+++ b/app/models/dev_ops_score/metric.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ConversationalDevelopmentIndex
+module DevOpsScore
   class Metric < ApplicationRecord
     include Presentable
 
diff --git a/app/presenters/conversational_development_index/metric_presenter.rb b/app/presenters/dev_ops_score/metric_presenter.rb
index 9639b84cf56..d22beefee54 100644
--- a/app/presenters/conversational_development_index/metric_presenter.rb
+++ b/app/presenters/dev_ops_score/metric_presenter.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module ConversationalDevelopmentIndex
+module DevOpsScore
   class MetricPresenter < Gitlab::View::Presenter::Simple
     def cards
       [
diff --git a/app/services/submit_usage_ping_service.rb b/app/services/submit_usage_ping_service.rb
index 415a02ab337..7927ab265c5 100644
--- a/app/services/submit_usage_ping_service.rb
+++ b/app/services/submit_usage_ping_service.rb
@@ -38,7 +38,7 @@ class SubmitUsagePingService
   def store_metrics(response)
     return unless response['conv_index'].present?
 
-    ConversationalDevelopmentIndex::Metric.create!(
+    DevOpsScore::Metric.create!(
       response['conv_index'].slice(*METRICS)
     )
   end