diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/assets/javascripts/analytics | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/analytics')
-rw-r--r-- | app/assets/javascripts/analytics/devops_reports/components/devops_score.vue (renamed from app/assets/javascripts/analytics/devops_report/components/devops_score.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/analytics/devops_reports/components/devops_score_callout.vue (renamed from app/assets/javascripts/analytics/devops_report/components/devops_score_callout.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/analytics/devops_reports/components/service_ping_disabled.vue (renamed from app/assets/javascripts/analytics/devops_report/components/service_ping_disabled.vue) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/analytics/devops_reports/constants.js (renamed from app/assets/javascripts/analytics/devops_report/constants.js) | 4 | ||||
-rw-r--r-- | app/assets/javascripts/analytics/devops_reports/devops_score.js (renamed from app/assets/javascripts/analytics/devops_report/devops_score.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/analytics/devops_reports/devops_score_disabled_service_ping.js (renamed from app/assets/javascripts/analytics/devops_report/devops_score_disabled_service_ping.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/analytics/shared/graphql/projects.query.graphql | 2 | ||||
-rw-r--r-- | app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/analytics/usage_trends/index.js | 2 |
9 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/analytics/devops_report/components/devops_score.vue b/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue index 238081cc3c0..238081cc3c0 100644 --- a/app/assets/javascripts/analytics/devops_report/components/devops_score.vue +++ b/app/assets/javascripts/analytics/devops_reports/components/devops_score.vue diff --git a/app/assets/javascripts/analytics/devops_report/components/devops_score_callout.vue b/app/assets/javascripts/analytics/devops_reports/components/devops_score_callout.vue index e594b4e360a..e594b4e360a 100644 --- a/app/assets/javascripts/analytics/devops_report/components/devops_score_callout.vue +++ b/app/assets/javascripts/analytics/devops_reports/components/devops_score_callout.vue diff --git a/app/assets/javascripts/analytics/devops_report/components/service_ping_disabled.vue b/app/assets/javascripts/analytics/devops_reports/components/service_ping_disabled.vue index 400326e41e1..400326e41e1 100644 --- a/app/assets/javascripts/analytics/devops_report/components/service_ping_disabled.vue +++ b/app/assets/javascripts/analytics/devops_reports/components/service_ping_disabled.vue diff --git a/app/assets/javascripts/analytics/devops_report/constants.js b/app/assets/javascripts/analytics/devops_reports/constants.js index b395d7eb464..6091fcb5724 100644 --- a/app/assets/javascripts/analytics/devops_report/constants.js +++ b/app/assets/javascripts/analytics/devops_reports/constants.js @@ -2,10 +2,10 @@ import { __ } from '~/locale'; export const INTRO_COOKIE_KEY = 'dev_ops_report_intro_callout_dismissed'; -export const INTRO_BANNER_TITLE = __('Introducing Your DevOps Report'); +export const INTRO_BANNER_TITLE = __('Introducing Your DevOps Reports'); export const INTRO_BANNER_BODY = __( - 'Your DevOps Report gives an overview of how you are using GitLab from a feature perspective. Use it to view how you compare with other organizations.', + 'Your DevOps Reports give an overview of how you are using GitLab from a feature perspective. Use them to view how you compare with other organizations, and how your teams compare against each other.', ); export const INTRO_BANNER_ACTION_TEXT = __('Read more'); diff --git a/app/assets/javascripts/analytics/devops_report/devops_score.js b/app/assets/javascripts/analytics/devops_reports/devops_score.js index 0bf98b65ed5..0bf98b65ed5 100644 --- a/app/assets/javascripts/analytics/devops_report/devops_score.js +++ b/app/assets/javascripts/analytics/devops_reports/devops_score.js diff --git a/app/assets/javascripts/analytics/devops_report/devops_score_disabled_service_ping.js b/app/assets/javascripts/analytics/devops_reports/devops_score_disabled_service_ping.js index eb2992422a4..eb2992422a4 100644 --- a/app/assets/javascripts/analytics/devops_report/devops_score_disabled_service_ping.js +++ b/app/assets/javascripts/analytics/devops_reports/devops_score_disabled_service_ping.js diff --git a/app/assets/javascripts/analytics/shared/graphql/projects.query.graphql b/app/assets/javascripts/analytics/shared/graphql/projects.query.graphql index 63e95d6804c..b870ed4dcbf 100644 --- a/app/assets/javascripts/analytics/shared/graphql/projects.query.graphql +++ b/app/assets/javascripts/analytics/shared/graphql/projects.query.graphql @@ -1,4 +1,4 @@ -query getGroupProjects( +query analyticsGetGroupProjects( $groupFullPath: ID! $search: String! $first: Int! diff --git a/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue b/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue index 1eb4832a2a3..63ec40d4ec6 100644 --- a/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue +++ b/app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue @@ -3,7 +3,7 @@ import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui'; import { GlSingleStat } from '@gitlab/ui/dist/charts'; import createFlash from '~/flash'; import { number } from '~/lib/utils/unit_format'; -import { s__ } from '~/locale'; +import { __, s__ } from '~/locale'; import usageTrendsCountQuery from '../graphql/queries/usage_trends_count.query.graphql'; const defaultPrecision = 0; @@ -52,7 +52,7 @@ export default { mergeRequests: s__('UsageTrends|Merge requests'), pipelines: s__('UsageTrends|Pipelines'), }, - loadCountsError: s__('Could not load usage counts. Please refresh the page to try again.'), + loadCountsError: __('Could not load usage counts. Please refresh the page to try again.'), }, }; </script> diff --git a/app/assets/javascripts/analytics/usage_trends/index.js b/app/assets/javascripts/analytics/usage_trends/index.js index 3e85832edcf..d1880b09f15 100644 --- a/app/assets/javascripts/analytics/usage_trends/index.js +++ b/app/assets/javascripts/analytics/usage_trends/index.js @@ -6,7 +6,7 @@ import UsageTrendsApp from './components/app.vue'; Vue.use(VueApollo); const apolloProvider = new VueApollo({ - defaultClient: createDefaultClient({}, { assumeImmutableResults: true }), + defaultClient: createDefaultClient(), }); export default () => { |