diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-03-01 17:02:01 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-03-03 16:47:38 -0600 |
| commit | 7371f6cd8c168df41e4197f80f53f3c04185dee7 (patch) | |
| tree | 5eaf634bd30bf984df0611470bc4e268f2ae9b7c /app/assets/javascripts/commons/bootstrap.js | |
| parent | cb6c036d8942ab24048b9ecebcc6c3fa408c9a3e (diff) | |
| download | gitlab-ce-7371f6cd8c168df41e4197f80f53f3c04185dee7.tar.gz | |
refactor common bundle to ES module syntax and move global exports to application.js
Diffstat (limited to 'app/assets/javascripts/commons/bootstrap.js')
| -rw-r--r-- | app/assets/javascripts/commons/bootstrap.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/javascripts/commons/bootstrap.js b/app/assets/javascripts/commons/bootstrap.js index 72e43d34a74..db0cbfd87c3 100644 --- a/app/assets/javascripts/commons/bootstrap.js +++ b/app/assets/javascripts/commons/bootstrap.js @@ -1,10 +1,10 @@ -require('./jquery'); +import 'jquery'; -// twitter bootstrap plugins -require('bootstrap-sass/assets/javascripts/bootstrap/affix'); -require('bootstrap-sass/assets/javascripts/bootstrap/alert'); -require('bootstrap-sass/assets/javascripts/bootstrap/dropdown'); -require('bootstrap-sass/assets/javascripts/bootstrap/modal'); -require('bootstrap-sass/assets/javascripts/bootstrap/tab'); -require('bootstrap-sass/assets/javascripts/bootstrap/transition'); -require('bootstrap-sass/assets/javascripts/bootstrap/tooltip'); +// bootstrap jQuery plugins +import 'bootstrap-sass/assets/javascripts/bootstrap/affix'; +import 'bootstrap-sass/assets/javascripts/bootstrap/alert'; +import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown'; +import 'bootstrap-sass/assets/javascripts/bootstrap/modal'; +import 'bootstrap-sass/assets/javascripts/bootstrap/tab'; +import 'bootstrap-sass/assets/javascripts/bootstrap/transition'; +import 'bootstrap-sass/assets/javascripts/bootstrap/tooltip'; |