diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-21 14:57:24 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-21 14:57:24 -0300 |
| commit | a294d8362bfb62b7133ad0799ae1327cd5ddd1e4 (patch) | |
| tree | 477930041d5c42f2453178ab110c8455c6d702fe /actionpack/lib/action_dispatch.rb | |
| parent | 378b02d3aa890cedabf1ef81c34a371dbbc52c25 (diff) | |
| parent | e2d0b0ee61c5a8c2626abb5ac1029b48ec1965eb (diff) | |
| download | rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.tar.gz rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.tar.bz2 rails-a294d8362bfb62b7133ad0799ae1327cd5ddd1e4.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_dispatch.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index 849f268a8c..5bcd2143a3 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -21,10 +21,6 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" -$:.unshift activesupport_path if File.directory?(activesupport_path) -require 'active_support' - require 'rack' module Rack @@ -59,3 +55,7 @@ module ActionDispatch end autoload :Mime, 'action_dispatch/http/mime_type' + +activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" +$:.unshift activesupport_path if File.directory?(activesupport_path) +require 'active_support' |