Merge pull request #62 from rails/fix-build

Fix build

Author: josh

.travis.yml

@@ -1,6 +1,4 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
 
@@ -9,18 +7,6 @@ gemfile:
   - test/gemfiles/Gemfile.rails-3.1.x
   - test/gemfiles/Gemfile.rails-3.2.x
   - test/gemfiles/Gemfile.rails-4.0.x
-  - test/gemfiles/Gemfile.rails-edge
-
-matrix:
-  exclude:
-    - rvm: 1.8.7
-      gemfile: test/gemfiles/Gemfile.rails-4.0.x
-    - rvm: 1.8.7
-      gemfile: test/gemfiles/Gemfile.rails-edge
-    - rvm: 1.9.2
-      gemfile: test/gemfiles/Gemfile.rails-4.0.x
-    - rvm: 1.9.2
-      gemfile: test/gemfiles/Gemfile.rails-edge
 
 notifications:
   email: false

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 gemspec
 
-# Roll w/ master until 4.0 is cut
-gem 'actionpack', :github => 'rails/rails', branch: 'master'
-gem 'railties', :github => 'rails/rails', branch: 'master'
+# Roll w/ branch until 4.0 is cut
+gem 'actionpack', :github => 'rails/rails', branch: '4-0-stable'
+gem 'railties', :github => 'rails/rails', branch: '4-0-stable'

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"

test/gemfiles/Gemfile.rails-4.0.x

@@ -3,5 +3,5 @@ gemspec :path => "./../.."
 
 # gem "actionpack", "~> 4.0.0"
 # gem "railties", "~> 4.0.0"
-gem "actionpack", "4.0.0.beta1"
-gem "railties", "4.0.0.beta1"
+gem 'actionpack', :github => 'rails/rails', branch: '4-0-stable'
+gem 'railties', :github => 'rails/rails', branch: '4-0-stable'