diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-13 14:18:31 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-13 14:18:31 -0800 |
| commit | 10cf66c034bed5bcd5b8c4cf372cf38e4730a483 (patch) | |
| tree | e7815e42da4bc92c0f33a116340d172462e97608 | |
| parent | 957da557027e5278b80165b0cb4f48dd837045af (diff) | |
| parent | a9e18df9c2332062be6d3b9938dc94e33d558b89 (diff) | |
| download | rails-10cf66c034bed5bcd5b8c4cf372cf38e4730a483.tar.gz rails-10cf66c034bed5bcd5b8c4cf372cf38e4730a483.tar.bz2 rails-10cf66c034bed5bcd5b8c4cf372cf38e4730a483.zip | |
Merge pull request #5026 from castlerock/remove_require_for_string_encoding
remove unused require for string encoding
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 1 | ||||
| -rw-r--r-- | actionpack/test/template/javascript_helper_test.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 309923490c..ac9e530f01 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -1,5 +1,4 @@ require 'action_view/helpers/tag_helper' -require 'active_support/core_ext/string/encoding' module ActionView module Helpers diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb index d98ffe8fa7..9441bd6b38 100644 --- a/actionpack/test/template/javascript_helper_test.rb +++ b/actionpack/test/template/javascript_helper_test.rb @@ -1,5 +1,4 @@ require 'abstract_unit' -require 'active_support/core_ext/string/encoding' class JavaScriptHelperTest < ActionView::TestCase tests ActionView::Helpers::JavaScriptHelper |