diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-30 17:34:53 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-30 17:35:17 -0800 |
| commit | 8ad9d14494dbe2a02d95ff6d23373b5662eede52 (patch) | |
| tree | e06f5d5489cb610a616ebd8ec8e7d0ca7d7bc274 /actionpack | |
| parent | 1a0c372b19b6d6521df7c39a01a02ef5350ab300 (diff) | |
| download | rails-8ad9d14494dbe2a02d95ff6d23373b5662eede52.tar.gz rails-8ad9d14494dbe2a02d95ff6d23373b5662eede52.tar.bz2 rails-8ad9d14494dbe2a02d95ff6d23373b5662eede52.zip | |
Partially revert "ActionDispatch should require as little of ActiveSupport as possible"
Removes load path change from commit bb153f42e45160c5ef3593c393db5d3c6857fb70.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index 49e1634af5..1e87a016f9 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -21,6 +21,8 @@ # 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' require 'active_support/dependencies/autoload' |