diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-09-06 16:33:24 +0000 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-06 11:52:28 -0500 |
commit | 8a70dcab94ddbf67fcd5350319b1aa1e0c8206f3 (patch) | |
tree | fe514d6a8b65912955dd8a5892e06ecd1bf323fe | |
parent | 1ea1bb6e76633b4303cb7eb561474375cbe77e50 (diff) | |
download | gitlab-ce-8a70dcab94ddbf67fcd5350319b1aa1e0c8206f3.tar.gz |
Merge branch 'improve-vuejs-resource-interceptor' into 'master'
Reduce intermittent spec failures by making VueJS resource interceptor decrement outstanding resource counts when HTTP response is received
Before the count would be reduced 500 ms after a DOM update tick, which could cause race conditions since the `DatabaseCleaner` could run in the middle of a Rails controller handling the response.
Partial fix to #21197 and other intermittent spec failures.
See merge request !6224
-rw-r--r-- | app/assets/javascripts/boards/vue_resource_interceptor.js.es6 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/assets/javascripts/boards/vue_resource_interceptor.js.es6 b/app/assets/javascripts/boards/vue_resource_interceptor.js.es6 index f9f9f7999d4..b5ff3a81ed5 100644 --- a/app/assets/javascripts/boards/vue_resource_interceptor.js.es6 +++ b/app/assets/javascripts/boards/vue_resource_interceptor.js.es6 @@ -1,10 +1,7 @@ -Vue.http.interceptors.push((request, next) => { +Vue.http.interceptors.push((request, next) => { Vue.activeResources = Vue.activeResources ? Vue.activeResources + 1 : 1; - Vue.nextTick(() => { - setTimeout(() => { - Vue.activeResources--; - }, 500); + next(function (response) { + Vue.activeResources--; }); - next(); }); |