diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-03-10 15:09:44 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-03-10 15:09:44 -0500 |
| commit | 0a887e2386a827f554c685dccf91701bb38422b5 (patch) | |
| tree | ae0f0c8013961b3091d6251ce3d89821ef014143 | |
| parent | 572e0aac802334d2029e67eb1e87356d890f4255 (diff) | |
| download | rails-0a887e2386a827f554c685dccf91701bb38422b5.tar.gz rails-0a887e2386a827f554c685dccf91701bb38422b5.tar.bz2 rails-0a887e2386a827f554c685dccf91701bb38422b5.zip | |
check for rack 1.0 gem before falling back to bundled version
| -rw-r--r-- | actionpack/lib/action_controller.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index ca826e7bfc..d03f4cb231 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -31,7 +31,12 @@ rescue LoadError end end -require 'action_controller/vendor/rack-1.0/rack' +begin + gem 'rack', '~> 1.0.0' + require 'rack' +rescue Gem::LoadError + require 'action_controller/vendor/rack-1.0/rack' +end module ActionController # TODO: Review explicit to see if they will automatically be handled by |