Merge branch 'master' into fix-build

josh · josh · commit 0d24dfffc719 · 2013-06-03T14:02:51.000-05:00
diff --git a/test/gemfiles/Gemfile.rails-3.2.x b/test/gemfiles/Gemfile.rails-3.2.x
@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 gemspec :path => "./../.."
 
-gem "actionpack", "~> 3.2.0"
-gem "railties", "~> 3.2.0"
+# Patch 3-2-stable to allow new sprockets
+gem "actionpack", "~> 3.2.0", :github => "josh/rails", :branch => "3-2-stable-sprockets"
+gem "railties", "~> 3.2.0", :github => "josh/rails", :branch => "3-2-stable-sprockets"
 gem "tzinfo"
