Udpate for CI

jgraichen · Oct 4, 2017 · 5baa62b · 5baa62b
1 parent 2848e4b
commit 5baa62b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,9 +5,9 @@ bundler_args: "--without development"
 services:
 - rabbitmq
 rvm:
-- '2.4.1'
-- '2.3.4'
-- '2.2.7'
+- '2.4.2'
+- '2.3.5'
+- '2.2.8'
 gemfile:
 - gemfiles/Gemfile.rails-5-1
 - gemfiles/Gemfile.rails-5-0

diff --git a/Gemfile b/Gemfile
@@ -8,9 +8,10 @@ gem 'coveralls'
 gem 'fuubar'
 gem 'rake'
 gem 'rspec', '~> 3.0'
+gem 'rubocop', '~> 0.50.0'
 
 group :rails do
-  gem 'rails', '>= 3.2' unless $RAILS
+  gem 'rails', '>= 4.2'
   gem 'rspec-rails'
   gem 'sqlite3'
 end

diff --git a/gemfiles/Gemfile.rails-master b/gemfiles/Gemfile.rails-master
@@ -7,7 +7,6 @@ gem 'activesupport', git: 'https://github.com/rails/rails'
 gem 'bunny', ENV['BUNNY_VERSION'] if ENV['BUNNY_VERSION']
 
 group :rails do
-  $RAILS = true
   gem 'rails', '>= 3.2', git: 'https://github.com/rails/rails'
   gem 'arel', git: 'https://github.com/rails/arel'
 end