Merge branch 'master' into feature/package-update

boxen · Jan 5, 2014 · 3df7c53 · 3df7c53
2 parents aa0f263 + 564782f
commit 3df7c53
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,9 @@
 ---
 script: "./script/cibuild"
 gemfile: "this/does/not/exist"
+env: GITHUB_API_TOKEN=36a1b2a815b98d755528fa6e09b845965fe1e046 # generic user account to get around api rate limit
 rvm:
       - "1.8.7"
+      - "2.0.0"
+before_install:
+  - gem update --system 2.1.11 # workaround for https://github.com/rubygems/rubygems/pull/763