Merge pull request gregschmit#75 from GetJobber/faster_travis

nathany · nathany · commit 21fc9e84a349 · 2014-12-22T14:31:54.000-07:00
use the new Travis CI docker-based infrastructure
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
+sudo: false
 language: ruby
 script: bundle exec rspec spec
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.3
+  - 2.1.5
   - jruby-19mode
 gemfile:
   - spec/gemfiles/Gemfile.rails-3.2.x
diff --git a/Gemfile b/Gemfile
@@ -6,5 +6,5 @@ gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
 
 gem 'jquery-rails'
 
-gem 'rails', '4.0.10'
-gem 'sass-rails', '~> 4.0.3'
+gem 'rails', '~> 4.0.12'
+gem 'sass-rails', '~> 4.0.5'
diff --git a/spec/gemfiles/Gemfile.rails-3.2.x b/spec/gemfiles/Gemfile.rails-3.2.x
@@ -6,5 +6,5 @@ gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 
 gem "jquery-rails"
 
-gem "rails", "3.2.19"
-gem "sass-rails", "3.2.6"
+gem "rails", "~> 3.2.21"
+gem "sass-rails", "~> 3.2.6"
diff --git a/spec/gemfiles/Gemfile.rails-4.0.x b/spec/gemfiles/Gemfile.rails-4.0.x
@@ -6,5 +6,5 @@ gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 
 gem "jquery-rails"
 
-gem "rails", "4.0.10"
-gem "sass-rails", "~> 4.0.3"
+gem "rails", "~> 4.0.12"
+gem "sass-rails", "~> 4.0.5"
diff --git a/spec/gemfiles/Gemfile.rails-4.1.x b/spec/gemfiles/Gemfile.rails-4.1.x
@@ -6,5 +6,5 @@ gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 
 gem "jquery-rails"
 
-gem "rails", "4.1.6"
-gem "sass-rails", "~> 4.0.3"
+gem "rails", "~> 4.1.8"
+gem "sass-rails", "~> 4.0.5"
diff --git a/spec/gemfiles/Gemfile.rails-4.2.x b/spec/gemfiles/Gemfile.rails-4.2.x
@@ -6,5 +6,5 @@ gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 
 gem "jquery-rails"
 
-gem "rails", "4.2.0.beta2"
-gem 'sass-rails', '~> 5.0.0.beta1'
+gem "rails", "~> 4.2.0"
+gem 'sass-rails', '~> 5.0.0'
