diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
commit | 835f1214dcc4e08e3076f269b7b2aa854ea4257a (patch) | |
tree | 07366d250301a8b2a8d7f24d220f4db21b5f6f59 /app/assets/javascripts/analytics | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/analytics')
5 files changed, 13 insertions, 13 deletions
diff --git a/app/assets/javascripts/analytics/instance_statistics/components/app.vue b/app/assets/javascripts/analytics/instance_statistics/components/app.vue index cdf1b1bbe2b..3bf41eaa008 100644 --- a/app/assets/javascripts/analytics/instance_statistics/components/app.vue +++ b/app/assets/javascripts/analytics/instance_statistics/components/app.vue @@ -1,10 +1,10 @@ <script> import { TODAY, TOTAL_DAYS_TO_SHOW, START_DATE } from '../constants'; +import ChartsConfig from './charts_config'; import InstanceCounts from './instance_counts.vue'; import InstanceStatisticsCountChart from './instance_statistics_count_chart.vue'; -import UsersChart from './users_chart.vue'; import ProjectsAndGroupsChart from './projects_and_groups_chart.vue'; -import ChartsConfig from './charts_config'; +import UsersChart from './users_chart.vue'; export default { name: 'InstanceStatisticsApp', diff --git a/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue b/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue index b331e659a92..f3779ed62e9 100644 --- a/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue +++ b/app/assets/javascripts/analytics/instance_statistics/components/instance_counts.vue @@ -1,9 +1,9 @@ <script> -import * as Sentry from '~/sentry/wrapper'; -import { s__ } from '~/locale'; +import MetricCard from '~/analytics/shared/components/metric_card.vue'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { SUPPORTED_FORMATS, getFormatter } from '~/lib/utils/unit_format'; -import MetricCard from '~/analytics/shared/components/metric_card.vue'; +import { s__ } from '~/locale'; +import * as Sentry from '~/sentry/wrapper'; import instanceStatisticsCountQuery from '../graphql/queries/instance_statistics_count.query.graphql'; const defaultPrecision = 0; diff --git a/app/assets/javascripts/analytics/instance_statistics/components/instance_statistics_count_chart.vue b/app/assets/javascripts/analytics/instance_statistics/components/instance_statistics_count_chart.vue index 620f38bd50f..e2defe0572d 100644 --- a/app/assets/javascripts/analytics/instance_statistics/components/instance_statistics_count_chart.vue +++ b/app/assets/javascripts/analytics/instance_statistics/components/instance_statistics_count_chart.vue @@ -1,16 +1,16 @@ <script> -import { GlLineChart } from '@gitlab/ui/dist/charts'; import { GlAlert } from '@gitlab/ui'; +import { GlLineChart } from '@gitlab/ui/dist/charts'; import { some, every } from 'lodash'; -import * as Sentry from '~/sentry/wrapper'; -import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; import { differenceInMonths, formatDateAsMonth, getDayDifference, } from '~/lib/utils/datetime_utility'; -import { getAverageByMonth, getEarliestDate, generateDataKeys } from '../utils'; +import * as Sentry from '~/sentry/wrapper'; +import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; import { TODAY, START_DATE } from '../constants'; +import { getAverageByMonth, getEarliestDate, generateDataKeys } from '../utils'; const QUERY_DATA_KEY = 'instanceStatisticsMeasurements'; diff --git a/app/assets/javascripts/analytics/instance_statistics/components/projects_and_groups_chart.vue b/app/assets/javascripts/analytics/instance_statistics/components/projects_and_groups_chart.vue index 46cc05fc124..3ffec90fb68 100644 --- a/app/assets/javascripts/analytics/instance_statistics/components/projects_and_groups_chart.vue +++ b/app/assets/javascripts/analytics/instance_statistics/components/projects_and_groups_chart.vue @@ -3,10 +3,10 @@ import { GlAlert } from '@gitlab/ui'; import { GlLineChart } from '@gitlab/ui/dist/charts'; import produce from 'immer'; import { sortBy } from 'lodash'; +import { formatDateAsMonth } from '~/lib/utils/datetime_utility'; +import { s__, __ } from '~/locale'; import * as Sentry from '~/sentry/wrapper'; import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; -import { s__, __ } from '~/locale'; -import { formatDateAsMonth } from '~/lib/utils/datetime_utility'; import latestGroupsQuery from '../graphql/queries/groups.query.graphql'; import latestProjectsQuery from '../graphql/queries/projects.query.graphql'; import { getAverageByMonth } from '../utils'; diff --git a/app/assets/javascripts/analytics/instance_statistics/components/users_chart.vue b/app/assets/javascripts/analytics/instance_statistics/components/users_chart.vue index 03462113630..73940f028a1 100644 --- a/app/assets/javascripts/analytics/instance_statistics/components/users_chart.vue +++ b/app/assets/javascripts/analytics/instance_statistics/components/users_chart.vue @@ -3,10 +3,10 @@ import { GlAlert } from '@gitlab/ui'; import { GlAreaChart } from '@gitlab/ui/dist/charts'; import produce from 'immer'; import { sortBy } from 'lodash'; +import { formatDateAsMonth } from '~/lib/utils/datetime_utility'; +import { __ } from '~/locale'; import * as Sentry from '~/sentry/wrapper'; import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; -import { __ } from '~/locale'; -import { formatDateAsMonth } from '~/lib/utils/datetime_utility'; import usersQuery from '../graphql/queries/users.query.graphql'; import { getAverageByMonth } from '../utils'; |