diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-25 00:08:34 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-25 00:08:34 +0000 |
commit | 1e6730a4e32f6cbf4b84aa9fc13204778783f33c (patch) | |
tree | 6dd6c9ed98ec836432cf431397a4ef45dd78deb8 /app/assets/javascripts/contributors | |
parent | 95a48f11db963bc55ab918e3eb24f8576dca4a81 (diff) | |
download | gitlab-ce-1e6730a4e32f6cbf4b84aa9fc13204778783f33c.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 | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/app/assets/javascripts/contributors/components/contributors.vue b/app/assets/javascripts/contributors/components/contributors.vue index 25ce6500094..512f060e2ea 100644 --- a/app/assets/javascripts/contributors/components/contributors.vue +++ b/app/assets/javascripts/contributors/components/contributors.vue @@ -204,15 +204,16 @@ export default { <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> - <gl-area-chart - slot-scope="{ width }" - class="gl-mb-5" - :width="width" - :data="masterChartData" - :option="masterChartOptions" - :height="masterChartHeight" - @created="onMasterChartCreated" - /> + <template #default="{ width }"> + <gl-area-chart + class="gl-mb-5" + :width="width" + :data="masterChartData" + :option="masterChartOptions" + :height="masterChartHeight" + @created="onMasterChartCreated" + /> + </template> </resizable-chart-container> <div class="row"> @@ -226,14 +227,15 @@ export default { {{ n__('%d commit', '%d commits', contributor.commits) }} ({{ contributor.email }}) </p> <resizable-chart-container> - <gl-area-chart - slot-scope="{ width }" - :width="width" - :data="contributor.dates" - :option="individualChartOptions" - :height="individualChartHeight" - @created="onIndividualChartCreated" - /> + <template #default="{ width }"> + <gl-area-chart + :width="width" + :data="contributor.dates" + :option="individualChartOptions" + :height="individualChartHeight" + @created="onIndividualChartCreated" + /> + </template> </resizable-chart-container> </div> </div> |