summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Sluijters <daenney@users.noreply.github.com>2015-04-22 19:00:32 +0200
committerDaniele Sluijters <daenney@users.noreply.github.com>2015-04-22 19:00:32 +0200
commit5a8edb31fb5ae1c9919106b06e58ed26d537b886 (patch)
tree8826b87203f200d21aac44cfc5fa1e9b4fb9c63d
parentf6742ddc4a7a8c67c6ffd0eb02add1f84cadfea4 (diff)
parent16a5bc5525249f1f1ae94b7f30528192b108046e (diff)
Merge branch 'master' into 1.0.x
-rw-r--r--.travis.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index b7ad44c..d807f71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,10 @@
language: ruby
sudo: false
+branches:
+ only:
+ - master
+
script: "bundle exec rake test SPEC_OPTS='--format documentation'"
matrix:
@@ -25,5 +29,4 @@ deploy:
secure: "PzzvPB326Yx0hheLbusZGYCGW4i1jOOMjwJMC/7QpbN4+gvMdmHpmQP3XeQ5tm+YYXqLPMyr1he1viTln8GPqLk1qpzF55H5mTakPxMjWZfRYvM+Q7lmtOEsBEXXSJk0ZYwMHXGVd8ouDrhaRzS2JqnhCAhLat0HeLcERWZx6Ok="
on:
tags: true
- all_branches: true
rvm: 2.1