Add latest changes from gitlab-org/gitlab@master

5 files changed, 14 insertions, 14 deletions

diff --git a/app/views/instance_statistics/conversational_development_index/_callout.html.haml b/app/views/instance_statistics/conversational_development_index/_callout.html.haml
index a4256e23979..15e31fa3d9c 100644
--- a/app/views/instance_statistics/conversational_development_index/_callout.html.haml
+++ b/app/views/instance_statistics/conversational_development_index/_callout.html.haml
@@ -9,5 +9,5 @@
         = _('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 you compare with other organizations, discover features you are not using, and learn best practices through blog posts and white papers.')
-    .svg-container.convdev
+    .svg-container.devops
       = custom_icon('convdev_overview')
diff --git a/app/views/instance_statistics/conversational_development_index/_card.html.haml b/app/views/instance_statistics/conversational_development_index/_card.html.haml
index 76af55dcf7a..c63bd96a175 100644
--- a/app/views/instance_statistics/conversational_development_index/_card.html.haml
+++ b/app/views/instance_statistics/conversational_development_index/_card.html.haml
@@ -1,6 +1,6 @@
-.convdev-card-wrapper
-  .convdev-card{ class: "convdev-card-#{score_level(card.percentage_score)}" }
-    .convdev-card-title
+.devops-card-wrapper
+  .devops-card{ class: "devops-card-#{score_level(card.percentage_score)}" }
+    .devops-card-title
       %h3
         = card.title
       .light-text
diff --git a/app/views/instance_statistics/conversational_development_index/_disabled.html.haml b/app/views/instance_statistics/conversational_development_index/_disabled.html.haml
index b854e15d36f..ddcbdf6dd27 100644
--- a/app/views/instance_statistics/conversational_development_index/_disabled.html.haml
+++ b/app/views/instance_statistics/conversational_development_index/_disabled.html.haml
@@ -1,4 +1,4 @@
-.container.convdev-empty
+.container.devops-empty
   .col-sm-12.justify-content-center.text-center
     = custom_icon('convdev_no_index')
     %h4= _('Usage ping is not enabled')
diff --git a/app/views/instance_statistics/conversational_development_index/_no_data.html.haml b/app/views/instance_statistics/conversational_development_index/_no_data.html.haml
index 4e8f34cd574..2031bced4fc 100644
--- a/app/views/instance_statistics/conversational_development_index/_no_data.html.haml
+++ b/app/views/instance_statistics/conversational_development_index/_no_data.html.haml
@@ -1,4 +1,4 @@
-.container.convdev-empty
+.container.devops-empty
   .col-sm-12.justify-content-center.text-center
     = custom_icon('convdev_no_data')
     %h4= _('Data is still calculating...')
diff --git a/app/views/instance_statistics/conversational_development_index/index.html.haml b/app/views/instance_statistics/conversational_development_index/index.html.haml
index 49c8fdc9630..f9a40152380 100644
--- a/app/views/instance_statistics/conversational_development_index/index.html.haml
+++ b/app/views/instance_statistics/conversational_development_index/index.html.haml
@@ -11,23 +11,23 @@
   - elsif @metric.blank?
     = render 'no_data'
   - else
-    .convdev
-      .convdev-header
-        %h2.convdev-header-title{ class: "convdev-#{score_level(@metric.average_percentage_score)}-score" }
+    .devops
+      .devops-header
+        %h2.devops-header-title{ class: "devops-#{score_level(@metric.average_percentage_score)}-score" }
           = number_to_percentage(@metric.average_percentage_score, precision: 1)
-        .convdev-header-subtitle
+        .devops-header-subtitle
           = _('index')
           %br
           = _('score')
           = link_to icon('question-circle', 'aria-hidden' => 'true'), help_page_path('user/instance_statistics/convdev')
 
-      .convdev-cards.board-card-container
+      .devops-cards.board-card-container
         - @metric.cards.each do |card|
           = render 'card', card: card
 
-      .convdev-steps.d-none.d-lg-block.d-xl-block
+      .devops-steps.d-none.d-lg-block.d-xl-block
         - @metric.idea_to_production_steps.each_with_index do |step, index|
-          .convdev-step{ class: "convdev-#{score_level(step.percentage_score)}-score" }
+          .devops-step{ class: "devops-#{score_level(step.percentage_score)}-score" }
             = custom_icon("i2p_step_#{index + 1}")
-            %h4.convdev-step-title
+            %h4.devops-step-title
               = step.title