diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-02-03 15:07:52 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-02-03 20:21:42 -0600 |
| commit | 56e5404dd57c85cbd2e9dbde6694cdf1222af8a1 (patch) | |
| tree | a7e6dd8df4b68949b2809e2d0d646d3dfd4e360c | |
| parent | ce4877e21882ddc2f5bdae5ab0768f02a32f6e84 (diff) | |
| download | gitlab-ce-go-go-gadget-webpack.tar.gz | |
fix failing testgo-go-gadget-webpack
| -rw-r--r-- | app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 b/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 index 5969d2ba56b..5840916846b 100644 --- a/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 +++ b/app/assets/javascripts/merge_request_widget/ci_bundle.js.es6 @@ -47,7 +47,7 @@ $('.js-rebase-button').html("<i class='fa fa-spinner fa-spin'></i> Rebase in progress"); }); } else { - merge_request_widget.getMergeStatus(); + setTimeout(() => merge_request_widget.getMergeStatus(), 200); } }); })(); |