Merge branch 'master' into rubocop

Conflicts: .travis.yml
yast · Aug 4, 2015 · 0ef3d0c · 0ef3d0c
2 parents 37d0c3f + 929d5b3
commit 0ef3d0c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ before_install:
     # disable rvm, use system Ruby
     - rvm reset
     - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "docbook-xsl xsltproc yast2-core-dev yast2-devtools libxcrypt-dev cmake yast2-ycp-ui-bindings-dev ruby2.1 ruby2.1-dev rake ruby-fast-gettext language-pack-en language-pack-cs" -g "yast-rake rspec:2.14.1 rubocop:0.29.1"
+    - sh ./travis_setup.sh -p "docbook-xsl xsltproc yast2-core-dev yast2-devtools libxcrypt-dev cmake yast2-ycp-ui-bindings-dev ruby2.1 ruby2.1-dev rake ruby-fast-gettext language-pack-en language-pack-cs" -g "yast-rake rspec:3.3.0 rubocop:0.29.1"
 script:
     - rake check:syntax
     - rubocop