diff --git a/Gemfile b/Gemfile index e93a940c5..e80a247d3 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'equivalent-xml', '~> 0.6.0' gem 'jquery-rails', '~> 4.3.1' gem 'rails_autolink', '~> 1.1.6' gem 'qa', '~> 1.1.0' -gem 'sprockets', '~> 2.12.4' # locked +gem 'sprockets', '~> 3.7.1' # locked gem 'rack-dev-mark', '~> 0.7.5' # Deploy with Capistrano diff --git a/Gemfile.lock b/Gemfile.lock index 617bd7d32..e09e54869 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,6 +125,7 @@ GEM coffee-script-source execjs coffee-script-source (1.10.0) + concurrent-ruby (1.0.5) coveralls (0.8.21) json (>= 1.8, < 3) simplecov (~> 0.14.1) @@ -156,7 +157,6 @@ GEM globalid (0.3.7) activesupport (>= 4.1.0) hashie (3.5.6) - hike (1.2.3) hooks (0.3.6) uber (~> 0.0.4) http-cookie (1.0.2) @@ -219,7 +219,6 @@ GEM mini_mime (0.1.3) mini_portile2 (2.3.0) minitest (5.10.2) - multi_json (1.12.1) multi_xml (0.6.0) multipart-post (2.0.0) net-scp (1.2.1) @@ -268,7 +267,7 @@ GEM nokogiri (~> 1.6) rails (>= 4.2.0, < 6.0) rdf - rack (1.6.8) + rack (1.6.9) rack-dev-mark (0.7.5) rack (>= 1.1) rack-test (0.6.3) @@ -391,11 +390,9 @@ GEM nokogiri stomp xml-simple - sprockets (2.12.4) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) @@ -412,7 +409,7 @@ GEM ref thor (0.19.4) thread_safe (0.3.6) - tilt (1.4.1) + tilt (2.0.8) tins (1.13.3) tzinfo (1.2.3) thread_safe (~> 0.1) @@ -490,7 +487,7 @@ DEPENDENCIES sitemap_generator (~> 5.3.1) solrizer (~> 3.1.0) solrizer-fedora! - sprockets (~> 2.12.4) + sprockets (~> 3.7.1) sqlite3 (~> 1.3.13) therubyracer (~> 0.12.3) uglifier (~> 3.2.0)