Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 14 deletions

diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_mini_graph.vue b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_mini_graph.vue
index 92f627b9d12..827adf9f7f7 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_mini_graph.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_mini_graph.vue
@@ -35,11 +35,6 @@ export default {
       required: true,
       default: () => [],
     },
-    stagesClass: {
-      type: [Array, Object, String],
-      required: false,
-      default: '',
-    },
     updateDropdown: {
       type: Boolean,
       required: false,
@@ -59,7 +54,7 @@ export default {
 };
 </script>
 <template>
-  <div class="stage-cell" data-testid="pipeline-mini-graph">
+  <div data-testid="pipeline-mini-graph">
     <linked-pipelines-mini-list
       v-if="upstreamPipeline"
       :triggered-by="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ [
@@ -77,7 +72,6 @@ export default {
       :is-merge-train="isMergeTrain"
       :stages="stages"
       :update-dropdown="updateDropdown"
-      :stages-class="stagesClass"
       data-testid="pipeline-stages"
       @miniGraphStageClick="$emit('miniGraphStageClick')"
     />
diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stages.vue b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stages.vue
index ceb771132dd..ba549d9b423 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stages.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stages.vue
@@ -17,11 +17,6 @@ export default {
       required: false,
       default: false,
     },
-    stagesClass: {
-      type: [Array, Object, String],
-      required: false,
-      default: '',
-    },
     isMergeTrain: {
       type: Boolean,
       required: false,
@@ -35,8 +30,7 @@ export default {
     <div
       v-for="stage in stages"
       :key="stage.name"
-      :class="stagesClass"
-      class="dropdown gl-display-inline-block gl-mr-2 gl-my-2 gl-vertical-align-middle stage-container"
+      class="pipeline-mini-graph-stage-container dropdown gl-display-inline-block gl-mr-2 gl-my-2 gl-vertical-align-middle"
     >
       <pipeline-stage
         :stage="stage"