diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 01:09:27 +0100 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 01:09:27 +0100 |
commit | 5a1fe9039b33414b7088813712e03bbe38567cff (patch) | |
tree | 10e3a15c06494dd09c0324dca894ddcbb68ce582 /actionpack/lib/action_view.rb | |
parent | 3384f073e35c5391deaeb209a62a485a0c4dd7b1 (diff) | |
parent | 7f6779c1d5e4ec7f642839caa7e86320720f77c8 (diff) | |
download | rails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.gz rails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.bz2 rails-5a1fe9039b33414b7088813712e03bbe38567cff.zip |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_view.rb')
-rw-r--r-- | actionpack/lib/action_view.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index e604c2a581..dd352f9ce0 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -30,6 +30,7 @@ rescue LoadError require 'active_support' end end +require 'active_support/core/all' require File.join(File.dirname(__FILE__), "action_pack") |