diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-17 23:47:22 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-17 23:47:22 +0100 |
| commit | 7872fa9a4397c450ee22c511966e149d594d153e (patch) | |
| tree | a2c8c71170734056e654ea489774005757db73dc | |
| parent | a6dc227167a8a720bd18495268305b15aa08d8f4 (diff) | |
| parent | 644219a680c97cea206e2029dbbbb19d35fd8047 (diff) | |
| download | rails-7872fa9a4397c450ee22c511966e149d594d153e.tar.gz rails-7872fa9a4397c450ee22c511966e149d594d153e.tar.bz2 rails-7872fa9a4397c450ee22c511966e149d594d153e.zip | |
Merge branch 'master' of gitproxy:rails/rails
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb index 5babc297c1..3ee5bcaab4 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -1,4 +1,5 @@ -require "erb" +require 'erb' +require 'active_support/core_ext/object/singleton_class' class ERB module Util |