Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 22 insertions, 5 deletions

diff --git a/app/assets/javascripts/projects/commit_box/info/init_commit_pipeline_mini_graph.js b/app/assets/javascripts/projects/commit_box/info/init_commit_pipeline_mini_graph.js
index 9173f5c771f..1d4ec4c110b 100644
--- a/app/assets/javascripts/projects/commit_box/info/init_commit_pipeline_mini_graph.js
+++ b/app/assets/javascripts/projects/commit_box/info/init_commit_pipeline_mini_graph.js
@@ -1,24 +1,41 @@
 import Vue from 'vue';
+import VueApollo from 'vue-apollo';
+import createDefaultClient from '~/lib/graphql';
+
+Vue.use(VueApollo);
+
+const apolloProvider = new VueApollo({
+  defaultClient: createDefaultClient(),
+});
 
 export const initCommitPipelineMiniGraph = async (selector = '.js-commit-pipeline-mini-graph') => {
   const el = document.querySelector(selector);
+
   if (!el) {
     return;
   }
 
+  const { stages, fullPath, iid } = el.dataset;
+
   // Some commits have no pipeline, code splitting to load the pipeline optionally
-  const { stages } = el.dataset;
-  const { default: PipelineMiniGraph } = await import(
-    /* webpackChunkName: 'pipelineMiniGraph' */ '~/pipelines/components/pipelines_list/pipeline_mini_graph.vue'
+  const { default: CommitBoxPipelineMiniGraph } = await import(
+    /* webpackChunkName: 'commitBoxPipelineMiniGraph' */ './components/commit_box_pipeline_mini_graph.vue'
   );
 
   // eslint-disable-next-line no-new
   new Vue({
     el,
+    apolloProvider,
+    provide: {
+      fullPath,
+      iid,
+      dataMethod: 'graphql',
+    },
     render(createElement) {
-      return createElement(PipelineMiniGraph, {
+      return createElement(CommitBoxPipelineMiniGraph, {
         props: {
-          stages: JSON.parse(stages),
+          // if stages do not exist for some reason, protect JSON.parse from erroring out
+          stages: stages ? JSON.parse(stages) : [],
         },
       });
     },