diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index a01ec2d..8ef892f --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'haml', '~>4.0.5' #gem 'sass' gem 'libxml-ruby' gem 'pg', '0.17.1' -gem 'sprockets', '1.0.2' +gem 'sprockets', '4.0.0' # gem 'hpricot' gem 'mixology' gem 'yui-compressor', '0.11.0' diff --git a/Gemfile.lock b/Gemfile.lock index ccb302f..a221788 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -39,6 +39,7 @@ GEM cocaine (0.6.0) terrapin (= 0.6.0) columnize (0.9.0) + concurrent-ruby (1.1.5) delayed_job (4.1.5) activesupport (>= 3.0, < 5.3) diff-lcs (1.3) @@ -143,7 +144,9 @@ GEM sass (3.3.4) spreadsheet (1.2.3) ruby-ole (>= 1.0) - sprockets (1.0.2) + sprockets (4.0.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) thor (0.14.6) @@ -183,7 +186,7 @@ DEPENDENCIES ruby-recaptcha rubyzip (~> 0.9.9) sass (= 3.3.4) - sprockets (= 1.0.2) + sprockets (= 4.0.0) uuidtools will_paginate yui-compressor (= 0.11.0)