diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 18:12:16 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-20 18:12:16 +0000 |
commit | 72c050db64bd61ae767f47c4fa2bc97b94a67592 (patch) | |
tree | 6e3b239ffcc70d9ca88bf3144d8459a86bed7c38 /app/assets/javascripts/contributors | |
parent | 1d033298a5973bdbd9c56d4eb0f1d29265b153a6 (diff) | |
download | gitlab-ce-72c050db64bd61ae767f47c4fa2bc97b94a67592.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/contributors')
-rw-r--r-- | app/assets/javascripts/contributors/components/contributors.vue | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/app/assets/javascripts/contributors/components/contributors.vue b/app/assets/javascripts/contributors/components/contributors.vue index 17e6cc87ff8..ce99d5da3cc 100644 --- a/app/assets/javascripts/contributors/components/contributors.vue +++ b/app/assets/javascripts/contributors/components/contributors.vue @@ -9,7 +9,6 @@ import { getSvgIconPathContent } from '~/lib/utils/icon_utils'; import { __ } from '~/locale'; import RefSelector from '~/ref/components/ref_selector.vue'; import { REF_TYPE_BRANCHES, REF_TYPE_TAGS } from '~/ref/constants'; -import ResizableChartContainer from '~/vue_shared/components/resizable_chart/resizable_chart_container.vue'; import { xAxisLabelFormatter, dateFormatter } from '../utils'; const GRAPHS_PATH_REGEX = /^(.*?)\/-\/graphs/g; @@ -26,7 +25,6 @@ export default { GlAreaChart, GlButton, GlLoadingIcon, - ResizableChartContainer, RefSelector, }, props: { @@ -249,18 +247,15 @@ export default { <div data-testid="contributors-charts"> <h4 class="gl-mb-2 gl-mt-5">{{ __('Commits to') }} {{ branch }}</h4> <span>{{ __('Excluding merge commits. Limited to 6,000 commits.') }}</span> - <resizable-chart-container> - <template #default="{ width }"> - <gl-area-chart - class="gl-mb-5" - :width="width" - :data="masterChartData" - :option="masterChartOptions" - :height="masterChartHeight" - @created="onMasterChartCreated" - /> - </template> - </resizable-chart-container> + <gl-area-chart + class="gl-mb-5" + responsive + width="auto" + :data="masterChartData" + :option="masterChartOptions" + :height="masterChartHeight" + @created="onMasterChartCreated" + /> <div class="row"> <div @@ -272,17 +267,14 @@ export default { <p class="gl-mb-3"> {{ n__('%d commit', '%d commits', contributor.commits) }} ({{ contributor.email }}) </p> - <resizable-chart-container> - <template #default="{ width }"> - <gl-area-chart - :width="width" - :data="contributor.dates" - :option="individualChartOptions" - :height="individualChartHeight" - @created="onIndividualChartCreated" - /> - </template> - </resizable-chart-container> + <gl-area-chart + responsive + width="auto" + :data="contributor.dates" + :option="individualChartOptions" + :height="individualChartHeight" + @created="onIndividualChartCreated" + /> </div> </div> </div> |