Merge branch 'master' into 33697-pipelines-json-endpoint

* master: (48 commits)
  Get rid of config/initializers/2_app.rb and define Gitlab in lib/gitlab.rb
  Fix eslint
  Fix eslint
  Address latest feedback
  Moved committer and spec. Added some extra code to run hooks or not depending on the options
  Fix minor typos
  Fix disabled state while making a request
  Move Settings to its own file, isolate it from Rails and introduce Gitlab.root
  Document the new 'spec/fast_spec_helper.rb' file
  Introduce spec/fast_spec_helper.rb to run spec files that don't rely on the whole Rails env
  Move spec helpers/matchers/shared examples/contexts to their relevant folder
  Use axios request to interact with API instead of UJS
  Emit `toggleCollapse`, `onDropdownClose` on component
  Add changelog for 2fa filter in users api
  Add 2FA filter to users API for admins only
  Emit `onValueClick` event on component when container is clicked
  Fix project creation for user endpoint bug
  Update repository storages documentation URL
  Flowdock uses Gitaly, not Grit
  fix revoke header on deploy token docs
  ...

1 files changed, 11 insertions, 3 deletions

diff --git a/app/assets/javascripts/pipelines/pipeline_details_bundle.js b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
index a61bfbe25f3..b743364ff43 100644
--- a/app/assets/javascripts/pipelines/pipeline_details_bundle.js
+++ b/app/assets/javascripts/pipelines/pipeline_details_bundle.js
@@ -25,6 +25,7 @@ export default () => {
     data() {
       return {
         mediator,
+        requestFinishedFor: null,
       };
     },
     created() {
@@ -35,12 +36,17 @@ export default () => {
     },
     methods: {
       postAction(action) {
-        this.mediator.service.postAction(action)
+        // Click was made, reset this variable
+        this.requestFinishedFor = null;
+
+        this.mediator.service
+          .postAction(action)
           .then(() => {
             this.mediator.refreshPipeline();
-            eventHub.$emit('graphActionFinished', action);
+            this.requestFinishedFor = action;
           })
           .catch(() => {
+            this.requestFinishedFor = action;
             Flash(__('An error occurred while making the request.'));
             eventHub.$emit('graphActionFinished', action);
           });
@@ -51,6 +57,7 @@ export default () => {
         props: {
           isLoading: this.mediator.state.isLoading,
           pipeline: this.mediator.store.state.pipeline,
+          requestFinishedFor: this.requestFinishedFor,
         },
       });
     },
@@ -75,7 +82,8 @@ export default () => {
     },
     methods: {
       postAction(action) {
-        this.mediator.service.postAction(action.path)
+        this.mediator.service
+          .postAction(action.path)
           .then(() => this.mediator.refreshPipeline())
           .catch(() => Flash(__('An error occurred while making the request.')));
       },