summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2012-10-07 13:48:36 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2012-10-07 13:48:36 +0200
commit3effca8291ed4941f7b3a1c2088b50274f28aa6f (patch)
treeb7af0c0388711163521de120d17123291595d62c
parent0081a2af728b19834309f6d60d33383de56f6026 (diff)
downloadcoderay-3effca8291ed4941f7b3a1c2088b50274f28aa6f.tar.gz
ruby-head does not work because of RedCloth, remove it from Travis configv1.0.8
-rw-r--r--.travis.yml6
-rw-r--r--Gemfile2
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 9ec759e..63a9b0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,9 @@ rvm:
- jruby-18mode
- jruby-19mode
- rbx-18mode
- - rbx-19mode # test again later
- - ruby-head # test again later
- - jruby-head # test again later
+ - rbx-19mode
+ # - ruby-head # test again later: RedCloth not compiling
+ - jruby-head
- ree
branches:
only:
diff --git a/Gemfile b/Gemfile
index 80fe57c..aa03288 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gemspec
group :development do
gem "bundler", ">= 1.0.0"
gem "rake", "~> 0.9.2"
- gem "RedCloth", RUBY_PLATFORM == 'java' ? "= 4.2.7" : ">= 4.0.3"
+ gem "RedCloth", RUBY_PLATFORM == 'java' ? ">= 4.2.7" : ">= 4.0.3"
gem "term-ansicolor"
gem "shoulda-context", "~> 1.0.0" if RUBY_VERSION >= '1.8.7'
gem "json" unless RUBY_VERSION >= '1.9.1'