Add latest changes from gitlab-org/gitlab@master

7 files changed, 0 insertions, 31 deletions

diff --git a/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue b/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue
index 7ee5ec48f44..387b01aee7e 100644
--- a/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue
+++ b/app/assets/javascripts/pipelines/components/jobs_shared/action_component.vue
@@ -70,7 +70,6 @@ export default {
       axios
         .post(`${this.link}.json`)
         .then(() => {
-          this.isDisabled = false;
           this.isLoading = false;
 
           this.$emit('pipelineActionRequestComplete');
diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/job_item.vue b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/job_item.vue
index efa2b3a4fff..51b46f25048 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/job_item.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/job_item.vue
@@ -137,9 +137,6 @@ export default {
     hideTooltips() {
       this.$root.$emit(BV_HIDE_TOOLTIP);
     },
-    pipelineActionRequestComplete() {
-      this.$emit('pipelineActionRequestComplete');
-    },
   },
 };
 </script>
@@ -184,7 +181,6 @@ export default {
       :link="status.action.path"
       :action-icon="status.action.icon"
       data-qa-selector="action_button"
-      @pipelineActionRequestComplete="pipelineActionRequestComplete"
     />
   </div>
 </template>
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 993fa121d89..92f627b9d12 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
@@ -56,11 +56,6 @@ export default {
       return Boolean(this.downstreamPipelines.length);
     },
   },
-  methods: {
-    onPipelineActionRequestComplete() {
-      this.$emit('pipelineActionRequestComplete');
-    },
-  },
 };
 </script>
 <template>
@@ -84,7 +79,6 @@ export default {
       :update-dropdown="updateDropdown"
       :stages-class="stagesClass"
       data-testid="pipeline-stages"
-      @pipelineActionRequestComplete="onPipelineActionRequestComplete"
       @miniGraphStageClick="$emit('miniGraphStageClick')"
     />
     <gl-icon
diff --git a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue
index 93110c8e3db..ec42b738e03 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_mini_graph/pipeline_stage.vue
@@ -100,13 +100,6 @@ export default {
           });
         });
     },
-    pipelineActionRequestComplete() {
-      // close the dropdown in MR widget
-      this.$refs.dropdown.hide();
-
-      // warn the pipelines table to update
-      this.$emit('pipelineActionRequestComplete');
-    },
     stageAriaLabel(title) {
       return sprintf(__('View Stage: %{title}'), { title });
     },
@@ -158,7 +151,6 @@ export default {
           :dropdown-length="dropdownContent.length"
           :job="job"
           css-class-job-name="mini-pipeline-graph-dropdown-item"
-          @pipelineActionRequestComplete="pipelineActionRequestComplete"
         />
       </li>
       <template v-if="isMergeTrain">
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 e965dc5e6b0..ceb771132dd 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
@@ -28,11 +28,6 @@ export default {
       default: false,
     },
   },
-  methods: {
-    onPipelineActionRequestComplete() {
-      this.$emit('pipelineActionRequestComplete');
-    },
-  },
 };
 </script>
 <template>
@@ -47,7 +42,6 @@ export default {
         :stage="stage"
         :update-dropdown="updateDropdown"
         :is-merge-train="isMergeTrain"
-        @pipelineActionRequestComplete="onPipelineActionRequestComplete"
         @miniGraphStageClick="$emit('miniGraphStageClick')"
       />
     </div>
diff --git a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue
index f6e46c090d3..346f5735576 100644
--- a/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines_list/pipelines_table.vue
@@ -124,9 +124,6 @@ export default {
       eventHub.$emit('postAction', this.endpoint);
       this.cancelingPipeline = this.pipelineId;
     },
-    onPipelineActionRequestComplete() {
-      eventHub.$emit('refreshPipelinesTable');
-    },
     trackPipelineMiniGraph() {
       this.track('click_minigraph', { label: TRACKING_CATEGORIES.table });
     },
@@ -179,7 +176,6 @@ export default {
           :stages="item.details.stages"
           :update-dropdown="updateGraphDropdown"
           :upstream-pipeline="item.triggered_by"
-          @pipelineActionRequestComplete="onPipelineActionRequestComplete"
           @miniGraphStageClick="trackPipelineMiniGraph"
         />
       </template>
diff --git a/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js b/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js
index 9602ca1ba88..07551c2342f 100644
--- a/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js
+++ b/app/assets/javascripts/pipelines/mixins/pipelines_mixin.js
@@ -55,7 +55,6 @@ export default {
     eventHub.$on('retryPipeline', this.postAction);
     eventHub.$on('clickedDropdown', this.updateTable);
     eventHub.$on('updateTable', this.updateTable);
-    eventHub.$on('refreshPipelinesTable', this.fetchPipelines);
     eventHub.$on('runMergeRequestPipeline', this.runMergeRequestPipeline);
   },
   beforeDestroy() {
@@ -63,7 +62,6 @@ export default {
     eventHub.$off('retryPipeline', this.postAction);
     eventHub.$off('clickedDropdown', this.updateTable);
     eventHub.$off('updateTable', this.updateTable);
-    eventHub.$off('refreshPipelinesTable', this.fetchPipelines);
     eventHub.$off('runMergeRequestPipeline', this.runMergeRequestPipeline);
   },
   destroyed() {