Merge remote-tracking branch 'origin/master' into lua-scanner

nathany · nathany · commit 0392439f9aaa · 2012-10-27T23:52:58.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -5,12 +5,11 @@ 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:
     - master
-    - stable
 script: "rake test" # test:scanners"
diff --git 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'
