diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-20 23:51:21 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-20 23:51:21 -0800 |
| commit | b0011dc74b0f99a31d8f2104cf9224499c28199f (patch) | |
| tree | ab30f1b36fd056a1c9bd24b23ef1f66a746e87dd /actionpack | |
| parent | 8e749cd4bd3d3cefa75636fb9ade1672c3c980d3 (diff) | |
| parent | ee69ef62a8edf6adfa4aba33e5d4f61ad55b6a25 (diff) | |
| download | rails-b0011dc74b0f99a31d8f2104cf9224499c28199f.tar.gz rails-b0011dc74b0f99a31d8f2104cf9224499c28199f.tar.bz2 rails-b0011dc74b0f99a31d8f2104cf9224499c28199f.zip | |
Merge pull request #4086 from ugisozols/master
Remove some of the ActiveSupport core extensions related to 1.8.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/number_helper.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_view/template/resolver.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/number_helper.rb b/actionpack/lib/action_view/helpers/number_helper.rb index b37e837a23..1c0fdb8ff9 100644 --- a/actionpack/lib/action_view/helpers/number_helper.rb +++ b/actionpack/lib/action_view/helpers/number_helper.rb @@ -1,7 +1,6 @@ # encoding: utf-8 require 'active_support/core_ext/big_decimal/conversions' -require 'active_support/core_ext/float/rounding' require 'active_support/core_ext/object/blank' require 'active_support/core_ext/string/output_safety' diff --git a/actionpack/lib/action_view/template/resolver.rb b/actionpack/lib/action_view/template/resolver.rb index f855ea257c..7fa86866a7 100644 --- a/actionpack/lib/action_view/template/resolver.rb +++ b/actionpack/lib/action_view/template/resolver.rb @@ -1,6 +1,5 @@ require "pathname" require "active_support/core_ext/class" -require "active_support/core_ext/io" require "action_view/template" module ActionView |