summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-27 19:14:20 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-27 19:14:20 +0000
commit4dea268215d8b061b6c368d71e2297478b4f9ace (patch)
treeb33e603f646618c05c144b8cbb1f6713f8d91973 /app/assets/javascripts
parent7e6da7b91a2374b465b62a80fc799a49539a8188 (diff)
parent05697adb42acc943d666f629ddfa07f7cc9e636c (diff)
downloadgitlab-ce-4dea268215d8b061b6c368d71e2297478b4f9ace.tar.gz
Merge branch 'rs-require-jquery-ui' into 'master'
Limit jquery-ui requires to what we actually use See merge request !2274
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/application.js.coffee5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 48c9890cfb5..d5e6ff0717a 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -5,7 +5,10 @@
# the compiled file.
#
#= require jquery
-#= require jquery-ui
+#= require jquery-ui/autocomplete
+#= require jquery-ui/datepicker
+#= require jquery-ui/effect-highlight
+#= require jquery-ui/sortable
#= require jquery_ujs
#= require jquery.cookie
#= require jquery.endless-scroll