Merge branch 'master' into mauriciomenegaz-fix_187

fphilipe · Apr 22, 2017 · ab5354f · ab5354f
2 parents 49bc834 + 7c15781
commit ab5354f
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,20 +3,18 @@ language: ruby
 cache: bundler
 script: bundle exec rspec
 rvm:
-  - 2.3.0
+  - 2.4.1
   - ruby-head
   - jruby
-  - rbx-2
 env:
   global:
     - JRUBY_OPTS="--2.0"
   matrix:
     - ACTION_MAILER_VERSION=4
-    - ACTION_MAILER_VERSION=5.beta
+    - ACTION_MAILER_VERSION=5
     - ACTION_MAILER_VERSION=master
 matrix:
   fast_finish: true
   allow_failures:
     - env: ACTION_MAILER_VERSION=master
-    - env: ACTION_MAILER_VERSION=5.beta
     - rvm: ruby-head