diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-12-30 12:58:40 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-12-30 12:58:40 -0800 |
| commit | bb153f42e45160c5ef3593c393db5d3c6857fb70 (patch) | |
| tree | 56bf45ad50ba3eb4d2f78833317f2fe5e9b156ff /actionpack | |
| parent | 7aabaac0f5ba108f917af2c65a79511694393b85 (diff) | |
| download | rails-bb153f42e45160c5ef3593c393db5d3c6857fb70.tar.gz rails-bb153f42e45160c5ef3593c393db5d3c6857fb70.tar.bz2 rails-bb153f42e45160c5ef3593c393db5d3c6857fb70.zip | |
ActionDispatch should require as little of ActiveSupport as possible
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index 7f61ff5657..49e1634af5 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -21,9 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__) -$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path) -require 'active_support/ruby/shim' +require 'active_support' require 'active_support/dependencies/autoload' require 'rack' |