diff options
author | shampton <shampton@gitlab.com> | 2019-06-28 15:36:56 -0700 |
---|---|---|
committer | shampton <shampton@gitlab.com> | 2019-06-28 15:36:56 -0700 |
commit | cfa0c6592a882f0792240ba70b5ce8fff2b46130 (patch) | |
tree | 3e3e02e2e9f7be8609b66fe518dacb1faea2f5f2 /app/assets/javascripts/pipelines/mixins | |
parent | 1cd8fb49f9b9150faf50767edbdfb564fde8576b (diff) | |
download | gitlab-ce-cfa0c6592a882f0792240ba70b5ce8fff2b46130.tar.gz |
Fix pipelines table update after action63590-pipeline-actions-cause-full-refresh
The pipelines table was showing the loading icon
after the user cancelled or retried a pipeline.
This fixes that so the pipeline updates without
removing the table from the DOM.
Diffstat (limited to 'app/assets/javascripts/pipelines/mixins')
-rw-r--r-- | app/assets/javascripts/pipelines/mixins/pipelines.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/pipelines/mixins/pipelines.js b/app/assets/javascripts/pipelines/mixins/pipelines.js index 3cc9d0a3a4e..a6243366375 100644 --- a/app/assets/javascripts/pipelines/mixins/pipelines.js +++ b/app/assets/javascripts/pipelines/mixins/pipelines.js @@ -107,8 +107,8 @@ export default { } // Stop polling this.poll.stop(); - // Update the table - return this.getPipelines().then(() => this.poll.restart()); + // Restarting the poll also makes an initial request + this.poll.restart(); }, fetchPipelines() { if (!this.isMakingRequest) { @@ -153,7 +153,7 @@ export default { postAction(endpoint) { this.service .postAction(endpoint) - .then(() => this.fetchPipelines()) + .then(() => this.updateTable()) .catch(() => Flash(__('An error occurred while making the request.'))); }, }, |