diff --git a/Gemfile b/Gemfile index d1a1e484c..a0effe65a 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org/' gem 'dotenv-rails', :require => "dotenv/rails-now" gem 'protected_attributes' -gem "sass-rails", "~> 4.0.0" +gem "sass-rails" gem "sprockets-rails", :require => "sprockets/railtie" gem "uglifier" gem "therubyracer", :platforms => :ruby diff --git a/Gemfile.lock b/Gemfile.lock index 2bc5786ac..c7b36630c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -281,12 +281,13 @@ GEM crass (~> 1.0.1) nokogiri (>= 1.4.4) nokogumbo (= 1.2.0) - sass (3.2.19) - sass-rails (4.0.5) - railties (>= 4.0.0, < 5.0) - sass (~> 3.2.2) - sprockets (~> 2.8, < 3.0) - sprockets-rails (~> 2.0) + sass (3.4.23) + sass-rails (5.0.6) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) shoulda-context (1.2.2) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) @@ -410,7 +411,7 @@ DEPENDENCIES ruby-prof rubyzip sanitize (~> 3.1.0) - sass-rails (~> 4.0.0) + sass-rails shoulda-context shoulda-matchers simple_form