diff --git a/Gemfile b/Gemfile index 5572dfa..35d677d 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'composite_primary_keys' gem 'underscore-rails' gem 'ember-rails' gem 'ember-source', '1.5.0' -gem 'bootstrap-sass', '~> 3.2.0' +gem 'bootstrap-sass', '~> 3.4.1' gem 'active_model_serializers', '~>0.9.0' gem 'dotenv' gem 'dotenv-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 130cb34..5eebc95 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,11 +43,14 @@ GEM airbrussh (1.3.1) sshkit (>= 1.6.1, != 1.7.0) arel (6.0.4) + autoprefixer-rails (9.6.1) + execjs barber (0.12.2) ember-source (>= 1.0, < 3.1) execjs (>= 1.2, < 3) - bootstrap-sass (3.2.0.4) - sass (~> 3.2) + bootstrap-sass (3.4.1) + autoprefixer-rails (>= 5.2.1) + sassc (>= 2.0.0) builder (3.2.3) capistrano (3.11.0) airbrussh (>= 1.0.0) @@ -95,7 +98,7 @@ GEM factory_girl_rails (4.9.0) factory_girl (~> 4.9.0) railties (>= 3.0.0) - ffi (1.10.0) + ffi (1.11.1) globalid (0.4.2) activesupport (>= 4.2.0) handlebars-source (1.3.0) @@ -195,6 +198,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.0.1) + ffi (~> 1.9) + rake shoulda-matchers (4.0.1) activesupport (>= 4.2.0) simplecov (0.16.1) @@ -232,7 +238,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (~> 0.9.0) - bootstrap-sass (~> 3.2.0) + bootstrap-sass (~> 3.4.1) capistrano capistrano-bundler capistrano-rails