diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-13 17:51:51 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-13 17:51:51 +0300 |
| commit | 34d7619a1c424029ebfb20c19bdaeff67b045891 (patch) | |
| tree | a2a66786e86c764338d1ece139395faaa717cf3e | |
| parent | e359f870f2ea95a76c36c10bbeee540b3cbfdb6b (diff) | |
| parent | d8296f873871120b7f4134bdcf8854a09b9e8be8 (diff) | |
Merge branch 'carousel-remove' into 'master'
Remove Bootstrap Carousel
The Bootstrap carousel module is used for image carousels, and we don't
use it anywhere on the site.
Fixes #14670.
See merge request !3624
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 12 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/tw_bootstrap.scss | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index b05138ac1ac..6f435e4c542 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -22,7 +22,17 @@ #= require cal-heatmap #= require turbolinks #= require autosave -#= require bootstrap +#= require bootstrap/affix +#= require bootstrap/alert +#= require bootstrap/button +#= require bootstrap/collapse +#= require bootstrap/dropdown +#= require bootstrap/modal +#= require bootstrap/scrollspy +#= require bootstrap/tab +#= require bootstrap/transition +#= require bootstrap/tooltip +#= require bootstrap/popover #= require select2 #= require raphael #= require g.raphael diff --git a/app/assets/stylesheets/framework/tw_bootstrap.scss b/app/assets/stylesheets/framework/tw_bootstrap.scss index dd42db1840f..96bab7880c2 100644 --- a/app/assets/stylesheets/framework/tw_bootstrap.scss +++ b/app/assets/stylesheets/framework/tw_bootstrap.scss @@ -43,7 +43,6 @@ @import "bootstrap/modals"; @import "bootstrap/tooltip"; @import "bootstrap/popovers"; -@import "bootstrap/carousel"; // Utility classes .clearfix { |