diff --git a/Gemfile.lock b/Gemfile.lock index 9455b58eb0..8e2bebc9d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,7 +21,6 @@ PATH rack (~> 1.4.5) rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.2.1) activemodel (3.2.19) activesupport (= 3.2.19) builder (~> 3.2) @@ -62,7 +61,6 @@ GEM builder (3.2.2) erubis (2.7.0) execjs (2.0.2) - hike (1.2.3) i18n (0.6.11) journey (1.0.4) jquery-rails (3.1.0) @@ -93,14 +91,8 @@ GEM rake (10.2.2) rdoc (3.12.2) json (~> 1.4) - sprockets (2.2.2) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.9) thor (0.19.1) - tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index d0b50791e9..2d477f2b47 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -26,7 +26,6 @@ Gem::Specification.new do |s| s.add_dependency('rack', '~> 1.4.5') s.add_dependency('rack-test', '~> 0.6.1') s.add_dependency('journey', '~> 1.0.4') - s.add_dependency('sprockets', '~> 2.2.1') s.add_dependency('erubis', '~> 2.7.0') s.add_development_dependency('tzinfo', '~> 0.3.29') diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb index 01ceb80972..82775b7e3b 100644 --- a/railties/lib/rails/all.rb +++ b/railties/lib/rails/all.rb @@ -6,7 +6,6 @@ require "rails" action_mailer active_resource rails/test_unit - sprockets ).each do |framework| begin require "#{framework}/railtie" diff --git a/vendor/cache/hike-1.2.3.gem b/vendor/cache/hike-1.2.3.gem deleted file mode 100644 index 3dd8fe7ae9..0000000000 Binary files a/vendor/cache/hike-1.2.3.gem and /dev/null differ diff --git a/vendor/cache/sprockets-2.2.2.gem b/vendor/cache/sprockets-2.2.2.gem deleted file mode 100644 index 455b4432a1..0000000000 Binary files a/vendor/cache/sprockets-2.2.2.gem and /dev/null differ diff --git a/vendor/cache/tilt-1.4.1.gem b/vendor/cache/tilt-1.4.1.gem deleted file mode 100644 index 3ad79a9b33..0000000000 Binary files a/vendor/cache/tilt-1.4.1.gem and /dev/null differ