ActionDispatch should require as little of ActiveSupport as possible

2009-12-30 12:58:40 -08:00 · 2009-12-30 12:58:40 -08:00 · bb153f42e4
parent 7aabaac0f5
commit bb153f42e4
1 changed files with 1 additions and 3 deletions
--- 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'