diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-05-25 21:05:53 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-05-25 21:05:53 +0000 |
commit | 74894a38779adb32a8b8a3cdad8358fc98693403 (patch) | |
tree | 4bf957d7b513797b03e571f451a760e2eb1524d8 /app/assets/javascripts/commons/bootstrap.js | |
parent | 6f4935bcee76a7af532399945f440a8fbd15658e (diff) | |
parent | d219ed25fa0b67984984f0b5f60f1eff7a0c34c9 (diff) | |
download | gitlab-ce-74894a38779adb32a8b8a3cdad8358fc98693403.tar.gz |
Merge branch 'bootstrap4' into 'master'
Upgrade to Bootstrap 4
Closes #45185 and #46710
See merge request gitlab-org/gitlab-ce!18232
Diffstat (limited to 'app/assets/javascripts/commons/bootstrap.js')
-rw-r--r-- | app/assets/javascripts/commons/bootstrap.js | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/assets/javascripts/commons/bootstrap.js b/app/assets/javascripts/commons/bootstrap.js index db96da4ccba..50e2949ab55 100644 --- a/app/assets/javascripts/commons/bootstrap.js +++ b/app/assets/javascripts/commons/bootstrap.js @@ -1,15 +1,7 @@ import $ from 'jquery'; // bootstrap jQuery plugins -import 'bootstrap-sass/assets/javascripts/bootstrap/affix'; -import 'bootstrap-sass/assets/javascripts/bootstrap/alert'; -import 'bootstrap-sass/assets/javascripts/bootstrap/button'; -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'; -import 'bootstrap-sass/assets/javascripts/bootstrap/popover'; +import 'bootstrap'; // custom jQuery functions $.fn.extend({ |