summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFilipa Lacerda <lacerda.filipa@gmail.com>2017-03-02 21:09:51 +0000
committerFilipa Lacerda <lacerda.filipa@gmail.com>2017-03-02 21:09:51 +0000
commitf0dc00d4c5ef474d19bbeea1a46e9604e129dcc3 (patch)
treeca5ffd07e0ea7721beb54d9bb3b45ef6d495d643 /app/assets
parent2429a109fd7df8ead9fdbbbb8b7b536e84a8aeb0 (diff)
parenta933b592b8c1f0cac99a4ed8b008600ff2c42643 (diff)
downloadgitlab-ce-f0dc00d4c5ef474d19bbeea1a46e9604e129dcc3.tar.gz
Merge branch 'bye-bye-unused-deps' into 'master'
Removed some unused JS deps See merge request !9652
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/application.js5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c51860d1604..4c24d35b5bb 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -9,7 +9,6 @@
window.$ = window.jQuery = require('jquery');
require('jquery-ujs');
require('vendor/jquery.endless-scroll');
-require('vendor/jquery.highlight');
require('vendor/jquery.waitforimages');
require('vendor/jquery.caret');
require('vendor/jquery.atwho');
@@ -18,15 +17,11 @@ window.Cookies = require('js-cookie');
require('./autosave');
require('bootstrap/js/affix');
require('bootstrap/js/alert');
-require('bootstrap/js/button');
-require('bootstrap/js/collapse');
require('bootstrap/js/dropdown');
require('bootstrap/js/modal');
-require('bootstrap/js/scrollspy');
require('bootstrap/js/tab');
require('bootstrap/js/transition');
require('bootstrap/js/tooltip');
-require('bootstrap/js/popover');
require('select2/select2.js');
window.Pikaday = require('pikaday');
window._ = require('underscore');