Commit 4ef3ee40 authored by Aakriti Gupta's avatar Aakriti Gupta

Frontend changes for replacing convdev index

parent 811ec8fa
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.user-callout{ data: { uid: 'dev_ops_score_intro_callout_dismissed' } } .user-callout{ data: { uid: 'dev_ops_score_intro_callout_dismissed' } }
.bordered-box.landing.content-block .bordered-box.landing.content-block
%button.btn.btn-default.close.js-close-callout{ type: 'button', %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') = icon('times', class: 'dismiss-icon', 'aria-hidden' => 'true')
.user-callout-copy .user-callout-copy
%h4 %h4
= _('Introducing Your Conversational Development Index') = _('Introducing Your DevOps Score')
%p %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.') = _('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.convdev .svg-container.devops
= custom_icon('dev_ops_score_overview') = custom_icon('dev_ops_score_overview')
- page_title _('ConvDev Index') - page_title _('DevOps Score')
- usage_ping_enabled = Gitlab::CurrentSettings.usage_ping_enabled - usage_ping_enabled = Gitlab::CurrentSettings.usage_ping_enabled
.container .container
......
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
.nav-icon-container .nav-icon-container
= sprite_icon('comment') = sprite_icon('comment')
%span.nav-item-name %span.nav-item-name
= _('ConvDev Index') = _('DevOps Score')
%ul.sidebar-sub-level-items.is-fly-out-only %ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: :dev_ops_score, html_options: { class: "fly-out-top-item" } ) do = nav_link(controller: :dev_ops_score, html_options: { class: "fly-out-top-item" } ) do
= link_to instance_statistics_dev_ops_score_index_path do = link_to instance_statistics_dev_ops_score_index_path do
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
= _('ConvDev Index') = _('DevOps Score')
- if Gitlab::CurrentSettings.usage_ping_enabled - if Gitlab::CurrentSettings.usage_ping_enabled
= nav_link(controller: :cohorts) do = nav_link(controller: :cohorts) do
......
---
title: Renamed Conversational Development Index feature to DevOps Score
merge_request:
author:
type: changed
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
require 'spec_helper' require 'spec_helper'
describe 'Dev Ops Score' do describe 'DevOps Score' do
before do before do
sign_in(create(:admin)) sign_in(create(:admin))
end end
...@@ -10,11 +10,11 @@ describe 'Dev Ops Score' do ...@@ -10,11 +10,11 @@ describe 'Dev Ops Score' do
it 'has dismissable intro callout', :js do it 'has dismissable intro callout', :js do
visit instance_statistics_dev_ops_score_index_path 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 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 end
context 'when usage ping is disabled' do context 'when usage ping is disabled' do
...@@ -31,7 +31,7 @@ describe 'Dev Ops Score' do ...@@ -31,7 +31,7 @@ describe 'Dev Ops Score' do
it 'hides the intro callout' do it 'hides the intro callout' do
visit instance_statistics_dev_ops_score_index_path 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
end end
......
...@@ -42,7 +42,7 @@ describe SubmitUsagePingService do ...@@ -42,7 +42,7 @@ describe SubmitUsagePingService do
subject.execute subject.execute
end 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) stub_response(with_conv_index_params)
expect { subject.execute } expect { subject.execute }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment