diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 10:51:19 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-02-02 10:51:19 +1100 |
| commit | d1eed079e1338249aa3b2881d07029ac4e71f4ed (patch) | |
| tree | 18088ca9388e1b7bd27fffea8cb41fa52b618c34 /actionpack/lib/action_view.rb | |
| parent | ddf2b4add33d5e54c5f5e7adacadbb50d3fa7b52 (diff) | |
| parent | b9edb0c60c11025311fb06f2e60b3354f1b6cb09 (diff) | |
| download | rails-d1eed079e1338249aa3b2881d07029ac4e71f4ed.tar.gz rails-d1eed079e1338249aa3b2881d07029ac4e71f4ed.tar.bz2 rails-d1eed079e1338249aa3b2881d07029ac4e71f4ed.zip | |
Merge branch 'master' of git://github.com/rails/rails
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 66fc530bec..f5035fe45a 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" |