Add latest changes from gitlab-org/gitlab@15-10-stable-eev15.10.0-rc42

2 files changed, 18 insertions, 26 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>
diff --git a/app/assets/javascripts/contributors/stores/actions.js b/app/assets/javascripts/contributors/stores/actions.js
index 3a6f4191031..5a8349aa1fd 100644
--- a/app/assets/javascripts/contributors/stores/actions.js
+++ b/app/assets/javascripts/contributors/stores/actions.js
@@ -1,4 +1,4 @@
-import { createAlert } from '~/flash';
+import { createAlert } from '~/alert';
 import { __ } from '~/locale';
 import service from '../services/contributors_service';
 import * as types from './mutation_types';