summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-02-09 11:03:36 +0000
committerPhil Hughes <me@iamphill.com>2017-02-09 15:54:19 +0000
commit88fb39c229ff6569b85417e6c63b87a77f97d667 (patch)
treecbd8ec345cc14a615f9123da2c13e9fd91ccbc1d
parentf9c58d938851ca63b8c4ff5d2bf9324aa6541170 (diff)
downloadgitlab-ce-88fb39c229ff6569b85417e6c63b87a77f97d667.tar.gz
Uses shared vue resource interceptor
-rw-r--r--app/assets/javascripts/diff_notes/services/resolve.js.es68
1 files changed, 1 insertions, 7 deletions
diff --git a/app/assets/javascripts/diff_notes/services/resolve.js.es6 b/app/assets/javascripts/diff_notes/services/resolve.js.es6
index d83a44ee205..090c454e9e4 100644
--- a/app/assets/javascripts/diff_notes/services/resolve.js.es6
+++ b/app/assets/javascripts/diff_notes/services/resolve.js.es6
@@ -4,6 +4,7 @@
const Vue = window.Vue = require('vue');
window.Vue.use(require('vue-resource'));
+require('../../vue_shared/vue_resource_interceptor');
(() => {
window.gl = window.gl || {};
@@ -12,13 +13,6 @@ window.Vue.use(require('vue-resource'));
constructor(root) {
this.noteResource = Vue.resource(`${root}/notes{/noteId}/resolve`);
this.discussionResource = Vue.resource(`${root}/merge_requests{/mergeRequestId}/discussions{/discussionId}/resolve`);
-
- Vue.http.interceptors.push((request, next) => {
- if ($.rails) {
- request.headers['X-CSRF-Token'] = $.rails.csrfToken();
- }
- next();
- });
}
resolve(noteId) {