Merge pull request rails#5026 from castlerock/remove_require_for_stri…

…ng_encoding remove unused require for string encoding
AntiTyping · Feb 13, 2012 · 10cf66c · 10cf66c
2 parents 957da55 + a9e18df
commit 10cf66c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git 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
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-require 'active_support/core_ext/string/encoding'
 
 class JavaScriptHelperTest < ActionView::TestCase
   tests ActionView::Helpers::JavaScriptHelper