summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-08-01 19:36:52 +0100
committerPhil Hughes <me@iamphill.com>2017-08-02 10:39:53 +0100
commit13cc7c28761d5b6b4b101007b9c0ec9af235bfe2 (patch)
tree4b161f49cdf4b3740bf072a3cbcd6c837f7b00ef
parent391b732d93b0529e5015f79369bfd9e24291ffb2 (diff)
downloadgitlab-ce-34904-specific-async-script-loading-by-using-a-page-variable.tar.gz
fixed underscore needing to be global for specs34904-specific-async-script-loading-by-using-a-page-variable
-rw-r--r--app/assets/javascripts/main.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 019ec728931..a807ce326a6 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -5,6 +5,7 @@
/* global Aside */
import jQuery from 'jquery';
+import _ from 'underscore';
import Cookies from 'js-cookie';
import Pikaday from 'pikaday';
import Dropzone from 'dropzone';
@@ -21,6 +22,7 @@ import './extensions/array';
// expose common libraries as globals (TODO: remove these)
window.jQuery = jQuery;
window.$ = jQuery;
+window._ = _;
window.Pikaday = Pikaday;
window.Dropzone = Dropzone;
window.Sortable = Sortable;