summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-03-02 00:37:07 -0600
committerMike Greiling <mike@pixelcog.com>2017-03-03 16:47:38 -0600
commit14517f977a55fbe0a2371ebb7d33df7c35415e8d (patch)
tree00586259442ab1a97c6055589a4c5a0b3939e12a /app/assets
parentba865db378b12265442c008a6fc167f2c3c910fb (diff)
downloadgitlab-ce-14517f977a55fbe0a2371ebb7d33df7c35415e8d.tar.gz
don't rely on global spaced Vue library for issuable bundle
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es62
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6 b/app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6
index 958a0cc6d50..0134b7cb6f3 100644
--- a/app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6
+++ b/app/assets/javascripts/issuable/time_tracking/time_tracking_bundle.js.es6
@@ -1,5 +1,7 @@
/* global Vue */
+window.Vue = require('vue');
+window.Vue.use(require('vue-resource'));
require('./components/time_tracker');
require('../../smart_interval');
require('../../subbable_resource');