diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-24 14:18:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-24 14:18:36 +0000 |
| commit | f82377b89ff008c7593cf3aeffc76ba073515e3c (patch) | |
| tree | 7094e9333294e484c53e3c39769d7839fc277afb /app | |
| parent | ead94db602f6f2e4d3b790bd4c7e645494d72318 (diff) | |
| parent | 2338785ec9fcacc43ba2098ab1485fca292c06cc (diff) | |
| download | gitlab-ce-f82377b89ff008c7593cf3aeffc76ba073515e3c.tar.gz | |
Merge branch 'wait-for-ajax-handling-all-js-requests' into 'master'
Use wait_for_requests for checking Vue resource and $.ajax requests [CE]
Closes #31946 and #31555
See merge request !11451
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/vue_shared/vue_resource_interceptor.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/vue_resource_interceptor.js b/app/assets/javascripts/vue_shared/vue_resource_interceptor.js index d5f87588c28..740930dce5b 100644 --- a/app/assets/javascripts/vue_shared/vue_resource_interceptor.js +++ b/app/assets/javascripts/vue_shared/vue_resource_interceptor.js @@ -4,7 +4,7 @@ import VueResource from 'vue-resource'; Vue.use(VueResource); // Maintain a global counter for active requests -// see: spec/support/wait_for_vue_resource.rb +// see: spec/support/wait_for_requests.rb Vue.http.interceptors.push((request, next) => { window.activeVueResources = window.activeVueResources || 0; window.activeVueResources += 1; |