Merge branch 'master' of github.com:sinatra/sinatra

Conflicts: Gemfile
sinatra · Mar 10, 2013 · 9543429 · 9543429
2 parents 94573ae + 020ba9f
commit 9543429
Show file tree

Hide file tree

Showing 3 changed files with 890 additions and 703 deletions.
diff --git a/Gemfile b/Gemfile
@@ -41,10 +41,11 @@ gem 'maruku'
 gem 'creole'
 gem 'markaby'
 gem 'radius'
-gem 'rabl' unless RUBY_ENGINE =~ /jruby|maglev/
+gem 'rabl'              unless RUBY_ENGINE =~ /jruby|maglev/
 gem 'wlang', '>= 2.0.1' unless RUBY_ENGINE =~ /jruby|rbx/
-gem 'therubyracer' unless RUBY_ENGINE =~ /jruby|rbx/
-gem 'redcarpet' unless RUBY_ENGINE == 'jruby'
+gem 'therubyracer'      unless RUBY_ENGINE =~ /jruby|rbx/
+gem 'redcarpet'         unless RUBY_ENGINE == 'jruby'
+gem 'bluecloth'         unless RUBY_ENGINE == 'jruby'
 
 if RUBY_ENGINE != 'rbx' or RUBY_VERSION < '1.9'
   gem 'liquid'