Permalink
Browse files

Drop rails < 4.1 from test matrix; add sprockets/sprockets-rails combos

  • Loading branch information...
1 parent 7a98b4b commit e27938b7f8b55145d2242c027525bc4881de0ba0 @jfirebaugh committed Feb 8, 2016
Showing with 12 additions and 11 deletions.
  1. +2 −2 .travis.yml
  2. +1 −1 Gemfile
  3. +0 −6 Gemfile-rails3
  4. +1 −1 Gemfile-rails41
  5. +2 −1 Gemfile-rails40 → Gemfile-sprockets2-sprocketsrails2
  6. +6 −0 Gemfile-sprockets3-sprocketsrails2
View
@@ -4,8 +4,8 @@ rvm:
- 2.2.0
gemfile:
- Gemfile
- - Gemfile-rails3
- - Gemfile-rails40
+ - Gemfile-sprockets2-sprocketsrails2
+ - Gemfile-sprockets3-sprocketsrails2
- Gemfile-rails41
before_script:
- sh -e /etc/init.d/xvfb start
View
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
gemspec
gem "railties", "~> 4.2.0"
-gem "sprockets-rails", "~> 2.0"
+gem "sprockets-rails"
View
@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem "railties", "~> 3.2"
-gem "actionpack", "~> 3.2"
-gem "test-unit", "~> 3.0"
View
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
gemspec
gem "railties", "~> 4.1.0"
-gem "sprockets-rails", "~> 2.0"
+gem "sprockets-rails"
@@ -1,5 +1,6 @@
source 'https://rubygems.org'
gemspec
-gem "railties", "~> 4.0.0"
+gem "railties", "~> 4.2.0"
+gem "sprockets", "~> 2.0"
gem "sprockets-rails", "~> 2.0"
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec
+
+gem "railties", "~> 4.2.0"
+gem "sprockets", "~> 3.0"
+gem "sprockets-rails", "~> 2.0"

0 comments on commit e27938b

Please sign in to comment.