aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_dispatch.rb')
-rw-r--r--actionpack/lib/action_dispatch.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 01e894cde6..a57fc5abdd 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -32,7 +32,12 @@ rescue LoadError
end
require 'active_support/core/all'
-gem 'rack', '~> 1.1.0'
+begin
+ gem 'rack', '~> 1.1.0'
+rescue Gem::LoadError
+ $:.unshift "#{File.dirname(__FILE__)}/action_dispatch/vendor/rack"
+end
+
require 'rack'
module ActionDispatch