Merge branch 'master' into rails5

Andrew Kane
2 parents 6e051d94 6d5a2cf5
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
.travis.yml
 language: ruby
 rvm:
-  - 2.2
+  - 2.2.4
   - jruby
 gemfile:
   - Gemfile
@@ -9,6 +9,7 @@ gemfile:
   - test/gemfiles/activerecord40.gemfile
   - test/gemfiles/activerecord41.gemfile
   - test/gemfiles/activerecord50.gemfile
+sudo: false
 script: bundle exec rake test
 before_install:
   - gem install bundler
1	1	language: ruby
2	2	rvm:
3		- - 2.2
	3	+ - 2.2.4
4	4	- jruby
5	5	gemfile:
6	6	- Gemfile
...	...	@@ -9,6 +9,7 @@ gemfile:
9	9	- test/gemfiles/activerecord40.gemfile
10	10	- test/gemfiles/activerecord41.gemfile
11	11	- test/gemfiles/activerecord50.gemfile
	12	+sudo: false
12	13	script: bundle exec rake test
13	14	before_install:
14	15	- gem install bundler
...	...