.travis.yml in activeadmin-1.0.0.pre5 vs .travis.yml in activeadmin-1.0.0

@@ -4,57 +4,55 @@
 
 sudo: false
 
 bundler_args: --without development
 
+branches:
+  only:
+    - master
+
 cache: bundler
 
 before_install:
   - PATH=$(npm bin):$PATH # needed to install phantomjs via npm
   - if [ $(phantomjs --version) != '2.1.1' ]; then npm install phantomjs-prebuilt@2.1; fi
   - gem update --system # use the very latest Rubygems
   - rvm @global do gem uninstall bundler -a -x
-  - rvm @global do gem install bundler -v 1.14.3 # latest version known to work
+  - rvm @global do gem install bundler -v 1.14.6 # latest version known to work
 
-before_script:
-  - bundle exec rake setup
-
 script:
-  - bundle exec rake test
+  - bundle exec rake
 
 rvm:
-  - jruby-9.1.7.0
-  - 1.9.3
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
+  - jruby-9.1.8.0
+  - 2.1.10
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 
 gemfile:
-  - gemfiles/rails_32.gemfile
-  - gemfiles/rails_40.gemfile
-  - gemfiles/rails_41.gemfile
   - gemfiles/rails_42.gemfile
   - gemfiles/rails_50.gemfile
+  - gemfiles/rails_51.gemfile
 
 env:
   global:
-    - JRUBY_OPTS="-J-Xmx1024m --debug"
+    - JRUBY_OPTS="-J-Xmx1024m --dev --debug"
 
 matrix:
   fast_finish: true
 
   exclude:
-    - rvm: 1.9.3
+    - rvm: 2.1.10
       gemfile: gemfiles/rails_50.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails_51.gemfile
 
-    - rvm: 2.4.0
-      gemfile: gemfiles/rails_32.gemfile
-
-    - rvm: 2.4.0
-      gemfile: gemfiles/rails_40.gemfile
-
-    - rvm: 2.4.0
-      gemfile: gemfiles/rails_41.gemfile
+  allow_failures:
+    - rvm: jruby-9.1.8.0
+      gemfile: gemfiles/rails_50.gemfile
+    - rvm: jruby-9.1.8.0
+      gemfile: gemfiles/rails_51.gemfile
 
 notifications:
   irc:
     channels:
       - irc.freenode.org#activeadmin