diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-01 23:42:38 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-01 23:42:38 +0000 |
| commit | fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3 (patch) | |
| tree | 347f771202054a443f9df23a8f65f91d49a52209 /actionpack/lib/action_view.rb | |
| parent | 27fa38cc3e162b2f8c4bb2d50130fbc17bad6039 (diff) | |
| parent | 16c0d1d3b6089bb4b0b0baf7c3eeb5949f31f02b (diff) | |
| download | rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.gz rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.bz2 rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_view.rb')
| -rw-r--r-- | actionpack/lib/action_view.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index 93aa69c060..483be47adf 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -35,7 +35,6 @@ module ActionView autoload :Context autoload :Template autoload :Helpers - autoload :SafeBuffer autoload_under "render" do autoload :Partials @@ -56,7 +55,7 @@ module ActionView autoload :TestCase, 'action_view/test_case' end -require 'action_view/erb/util' +require 'active_support/core_ext/string/output_safety' require 'action_view/base' I18n.load_path << "#{File.dirname(__FILE__)}/action_view/locale/en.yml" |