Merge branch 'master' of gitproxy:rails/rails

7872fa9a · José Valim · a6dc2271 · 644219a6 · 7872fa9a
显示空白变更内容
内联并排

Showing with 2 addition and 1 deletion

activesupport/lib/active_support/core_ext/string/output_safety.rb ...pport/lib/active_support/core_ext/string/output_safety.rb +2 -1

未找到文件。
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
-require "erb"
+require 'erb'
+require 'active_support/core_ext/object/singleton_class'
 class ERB
  module Util