Permalink
Browse files

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

  • Loading branch information...
2 parents 49857fb + f383fac commit 5b59546a1b5e3f8c3719435625222c87188cabb8 @rkh rkh committed Aug 21, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 Gemfile
View
4 Gemfile
@@ -42,8 +42,8 @@ gem 'maruku'
gem 'creole'
gem 'markaby'
gem 'radius'
-gem 'wlang', '>= 2.0.1'
-gem 'rabl' unless RUBY_ENGINE == 'jruby'
+gem 'wlang', '>= 2.0.1' unless RUBY_ENGINE == "maglev"
+gem 'rabl' unless RUBY_ENGINE =~ /jruby|maglev/
if RUBY_ENGINE == 'jruby'
gem 'nokogiri', '!= 1.5.0'

0 comments on commit 5b59546

Please sign in to comment.