diff options
| author | Joshua Peek <josh@joshpeek.com> | 2012-10-15 10:20:50 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2012-10-15 10:20:50 -0500 |
| commit | c800e27ad35ec46f32b5ac4428e5cf7141f95105 (patch) | |
| tree | 0821e0afaba2a74dec6ea1397ee3cabfd3d10c59 /actionpack/lib/action_view | |
| parent | 7dba1599d9092a8362956a3fab23b2c60eedea63 (diff) | |
| parent | 46dc6e7786222865309d15a9eaaaf55e3b7d9c1f (diff) | |
| download | rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.gz rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.bz2 rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.zip | |
Merge branch 'master' into asset-path-helper
Conflicts:
railties/test/application/configuration_test.rb
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/helpers.rb b/actionpack/lib/action_view/helpers.rb index dad50a58a1..269e78a021 100644 --- a/actionpack/lib/action_view/helpers.rb +++ b/actionpack/lib/action_view/helpers.rb @@ -29,10 +29,6 @@ module ActionView #:nodoc: extend ActiveSupport::Concern - included do - extend SanitizeHelper::ClassMethods - end - include ActiveModelHelper include AssetTagHelper include AssetUrlHelper |