diff --git a/Gemfile b/Gemfile index ca6b0d9..41ffba1 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' gem 'rails', '4.1.4' gem 'nokogiri' gem 'newrelic_rpm' -gem 'bootstrap-sass', '~> 3.1.1' +gem 'bootstrap-sass', '~> 3.2.0' gem 'coveralls', require: false group :development do @@ -27,7 +27,7 @@ end # Gems used only for assets and not required # in production environments by default. -gem 'sass-rails', github: 'rails/sass-rails' +gem 'sass-rails', '>= 3.2' gem 'uglifier' gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 5c30e9f..34b3b34 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: git://github.com/rails/sass-rails.git - revision: 3a9e47db7d769221157c82229fc1bade55b580f0 - specs: - sass-rails (4.0.1) - railties (>= 4.0.0, < 5.0) - sass (~> 3.2) - sprockets (~> 2.12) - sprockets-rails (~> 2.0) - GEM remote: https://rubygems.org/ specs: @@ -39,7 +29,7 @@ GEM tzinfo (~> 1.1) addressable (2.3.6) arel (5.0.1.20140414130214) - bootstrap-sass (3.1.1.1) + bootstrap-sass (3.2.0.0) sass (~> 3.2) builder (3.2.2) byebug (3.1.2) @@ -67,7 +57,7 @@ GEM execjs (2.0.2) hike (1.2.3) i18n (0.6.11) - jquery-rails (3.1.0) + jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) @@ -79,7 +69,7 @@ GEM minitest (5.4.0) multi_json (1.10.1) netrc (0.7.7) - newrelic_rpm (3.8.1.221) + newrelic_rpm (3.9.0.229) nokogiri (1.6.2.1) mini_portile (= 0.6.0) pg (0.17.1) @@ -124,13 +114,18 @@ GEM rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) safe_yaml (1.0.3) - sass (3.3.7) + sass (3.2.19) + sass-rails (4.0.3) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) simplecov (0.8.2) docile (~> 1.1.0) multi_json simplecov-html (~> 0.8.0) simplecov-html (0.8.0) - sprockets (2.12.1) + sprockets (2.11.0) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -154,7 +149,7 @@ GEM uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) - vcr (2.9.0) + vcr (2.9.2) webmock (1.18.0) addressable (>= 2.3.6) crack (>= 0.3.2) @@ -165,7 +160,7 @@ PLATFORMS ruby DEPENDENCIES - bootstrap-sass (~> 3.1.1) + bootstrap-sass (~> 3.2.0) byebug capybara coveralls @@ -176,7 +171,7 @@ DEPENDENCIES rails (= 4.1.4) rails_12factor rspec-rails - sass-rails! + sass-rails (>= 3.2) sqlite3 uglifier vcr