Merge branch 'ag-rename-convdev-frontend' into 'master'

[Frontend] Rename ConvDev Index to DevOps Score

See merge request gitlab-org/gitlab!20645

app/views/instance_statistics/dev_ops_score/_callout.html.haml

@@ -2,12 +2,12 @@
 .user-callout{ data: { uid: 'dev_ops_score_intro_callout_dismissed' } }
   .bordered-box.landing.content-block
     %button.btn.btn-default.close.js-close-callout{ type: 'button',
-      'aria-label' => _('Dismiss ConvDev introduction') }
+      'aria-label' => _('Dismiss DevOps Score introduction') }
       = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true')
     .user-callout-copy
       %h4
-        = _('Introducing Your Conversational Development Index')
+        = _('Introducing Your DevOps Score')
       %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
+        = _('Your DevOps Score 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.devops
       = custom_icon('dev_ops_score_overview')

app/views/instance_statistics/dev_ops_score/index.html.haml

-- page_title _('ConvDev Index')
+- page_title _('DevOps Score')
 - usage_ping_enabled = Gitlab::CurrentSettings.usage_ping_enabled
 
 .container

app/views/layouts/nav/sidebar/_instance_statistics.html.haml

@@ -11,12 +11,12 @@
           .nav-icon-container
             = sprite_icon('comment')
           %span.nav-item-name
-            = _('ConvDev Index')
+            = _('DevOps Score')
         %ul.sidebar-sub-level-items.is-fly-out-only
           = nav_link(controller: :dev_ops_score, html_options: { class: "fly-out-top-item" } ) do
             = link_to instance_statistics_dev_ops_score_index_path do
               %strong.fly-out-top-item-name
-                = _('ConvDev Index')
+                = _('DevOps Score')
 
       - if Gitlab::CurrentSettings.usage_ping_enabled
         = nav_link(controller: :cohorts) do

doc/user/admin_area/monitoring/convdev.md → doc/user/admin_area/monitoring/dev_ops_score.md

 ---
-redirect_to: '../../instance_statistics/convdev.md'
+redirect_to: '../../instance_statistics/dev_ops_score.md'
 ---
 
-This document was moved to [another location](../../instance_statistics/convdev.md).
+This document was moved to [another location](../../instance_statistics/dev_ops_score.md).

doc/user/instance_statistics/convdev.md → doc/user/instance_statistics/dev_ops_score.md

-# Conversational Development Index
+# DevOps Score
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/30469) in GitLab 9.3.
+> [Renamed from Conversational Development Index](https://gitlab.com/gitlab-org/gitlab/issues/20976) in GitLab 12.6.
 
 NOTE: **Note:**
 Your GitLab instance's [usage ping](../admin_area/settings/usage_statistics.md#usage-ping-core-only) must be activated in order to use this feature.
 
-The [Conversational Development](http://conversationaldevelopment.com/2017/04/16/what-is-conversational-development/) Index (ConvDev Index) gives you an overview of your entire
-instance's adoption of [Concurrent DevOps](https://about.gitlab.com/concurrent-devops/)
+The DevOps Score gives you an overview of your entire instance's adoption of
+[Concurrent DevOps](https://about.gitlab.com/concurrent-devops/)
 from planning to monitoring.
 
 This displays the usage of these GitLab features over
@@ -16,7 +16,7 @@ of top-performing instances based on [usage ping data](../admin_area/settings/us
 collected. Your score is compared to the lead score of each feature and then expressed as a percentage at the bottom of said feature.
 Your overall index score is an average of all your feature score percentages - this percentage value is presented above all the of features on the page.
 
-![ConvDev index](img/convdev_index.png)
+![DevOps Score](img/dev_ops_score.png)
 
 The page also provides helpful links to articles and GitLab docs, to help you
 improve your scores.

doc/user/instance_statistics/index.md

@@ -12,5 +12,5 @@ and can be accessed via the top bar.
 
 There are two kinds of statistics:
 
-- [Conversational Development (ConvDev) Index](convdev.md): Provides an overview of your entire instance's feature usage.
+- [Dev Ops Score](dev_ops_score.md): Provides an overview of your entire instance's feature usage.
 - [User Cohorts](user_cohorts.md): Display the monthly cohorts of new users and their activities over time.

ee/changelogs/unreleased/ag-rename-convdev-frontend.yml

+---
+title: Renamed Conversational Development Index feature to DevOps Score
+merge_request:
+author:
+type: changed

locale/gitlab.pot

@@ -4743,9 +4743,6 @@ msgstr ""
 msgid "Control the maximum concurrency of repository backfill for this secondary node"
 msgstr ""
 
-msgid "ConvDev Index"
-msgstr ""
-
 msgid "Cookie domain"
 msgstr ""
 
@@ -5919,6 +5916,9 @@ msgstr ""
 msgid "Detect host keys"
 msgstr ""
 
+msgid "DevOps Score"
+msgstr ""
+
 msgid "Diff content limits"
 msgstr ""
 
@@ -6021,10 +6021,10 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-msgid "Dismiss ConvDev introduction"
+msgid "Dismiss Cycle Analytics introduction box"
 msgstr ""
 
-msgid "Dismiss Cycle Analytics introduction box"
+msgid "Dismiss DevOps Score introduction"
 msgstr ""
 
 msgid "Dismiss Merge Request promotion"
@@ -9594,7 +9594,7 @@ msgstr ""
 msgid "Introducing Cycle Analytics"
 msgstr ""
 
-msgid "Introducing Your Conversational Development Index"
+msgid "Introducing Your DevOps Score"
 msgstr ""
 
 msgid "Invalid Git ref"
@@ -20324,10 +20324,10 @@ msgstr ""
 msgid "Your Commit Email will be used for web based operations, such as edits and merges."
 msgstr ""
 
-msgid "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."
+msgid "Your Default Notification Email will be used for account notifications if a %{openingTag}group-specific email address%{closingTag} is not set."
 msgstr ""
 
-msgid "Your Default Notification Email will be used for account notifications if a %{openingTag}group-specific email address%{closingTag} is not set."
+msgid "Your DevOps Score 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."
 msgstr ""
 
 msgid "Your GPG keys (%{count})"

spec/features/instance_statistics/dev_ops_score_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Dev Ops Score' do
+describe 'DevOps Score' do
   before do
     sign_in(create(:admin))
   end
@@ -10,11 +10,11 @@ describe 'Dev Ops Score' do
   it 'has dismissable intro callout', :js do
     visit instance_statistics_dev_ops_score_index_path
 
-    expect(page).to have_content 'Introducing Your Conversational Development Index'
+    expect(page).to have_content 'Introducing Your DevOps Score'
 
     find('.js-close-callout').click
 
-    expect(page).not_to have_content 'Introducing Your Conversational Development Index'
+    expect(page).not_to have_content 'Introducing Your DevOps Score'
   end
 
   context 'when usage ping is disabled' do
@@ -31,7 +31,7 @@ describe 'Dev Ops Score' do
     it 'hides the intro callout' do
       visit instance_statistics_dev_ops_score_index_path
 
-      expect(page).not_to have_content 'Introducing Your Conversational Development Index'
+      expect(page).not_to have_content 'Introducing Your DevOps Score'
     end
   end
 

spec/services/submit_usage_ping_service_spec.rb

@@ -42,7 +42,7 @@ describe SubmitUsagePingService do
       subject.execute
     end
 
-    it 'saves conversational development index data from the response' do
+    it 'saves DevOps Score data from the response' do
       stub_response(with_conv_index_params)
 
       expect { subject.execute }