diff --git a/Gemfile b/Gemfile index 5bc54767..9e5b6de8 100644 --- a/Gemfile +++ b/Gemfile @@ -80,7 +80,7 @@ gem 'uglifier' gem 'sass-rails', '>= 3.2' gem 'jquery-rails' gem 'jquery-ui-rails' -gem 'bootstrap-sass', '~> 3.3.3' +gem 'bootstrap-sass', '~> 3.4.1' gem 'bootstrap_form' gem 'bootstrap-material-design' diff --git a/Gemfile.lock b/Gemfile.lock index c03650ce..05369db6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,9 +55,8 @@ GEM activesupport (>= 3.2) request_store (~> 1.0) scrypt (>= 1.2, < 3.0) - autoprefixer-rails (6.1.2) + autoprefixer-rails (9.6.5) execjs - json autotest-rails (4.2.1) ZenTest (~> 4.5) bcrypt (3.1.10) @@ -70,9 +69,9 @@ GEM railties (>= 3.0) bootstrap-material-design (0.2.2) bootstrap-sass (~> 3.0) - bootstrap-sass (3.3.6) + bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) - sass (>= 3.3.4) + sassc (>= 2.0.0) bootstrap_form (2.3.0) builder (3.2.2) bullet (4.14.10) @@ -114,7 +113,7 @@ GEM exception_notification (4.1.1) actionmailer (>= 3.0.4) activesupport (>= 3.0.4) - execjs (2.6.0) + execjs (2.7.0) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.5.0) @@ -154,7 +153,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.3) + json (1.8.6) kaminari (0.15.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -222,6 +221,9 @@ GEM thor (>= 0.18.1, < 2.0) raindrops (0.15.0) rake (10.4.2) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) ref (2.0.0) request_store (1.2.1) rspec (3.4.0) @@ -249,13 +251,19 @@ GEM sexp_processor (~> 4.1) rubycas-client (2.3.9) activesupport - sass (3.4.19) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.2.1) + ffi (~> 1.9) scrypt (2.0.2) ffi-compiler (>= 0.0.2) rake @@ -315,7 +323,7 @@ DEPENDENCIES binding_of_caller bootstrap-datepicker-rails bootstrap-material-design - bootstrap-sass (~> 3.3.3) + bootstrap-sass (~> 3.4.1) bootstrap_form bullet byebug