diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-21 22:10:32 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-21 22:10:32 -0800 |
| commit | 667d7aa61d0c50be23ab24a4c16b8c9c9c0daff8 (patch) | |
| tree | 6ed040d81478b837b43286c386637fe95b4a0618 /activesupport/lib/active_support/ruby/shim.rb | |
| parent | 401b266f5fc1e6c5f13feb36122a1983989d8f58 (diff) | |
| parent | 7bfaa979e4e48dea68023e1aa67eabd160c3a7d3 (diff) | |
| download | rails-667d7aa61d0c50be23ab24a4c16b8c9c9c0daff8.tar.gz rails-667d7aa61d0c50be23ab24a4c16b8c9c9c0daff8.tar.bz2 rails-667d7aa61d0c50be23ab24a4c16b8c9c9c0daff8.zip | |
Merge pull request #4125 from nashby/remove-process-daemon
remove Proces.daemon from core_ext
Diffstat (limited to 'activesupport/lib/active_support/ruby/shim.rb')
| -rw-r--r-- | activesupport/lib/active_support/ruby/shim.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb index fc37ab84a3..fd59677d83 100644 --- a/activesupport/lib/active_support/ruby/shim.rb +++ b/activesupport/lib/active_support/ruby/shim.rb @@ -4,7 +4,6 @@ # Date next_year, next_month # DateTime to_date, to_datetime, xmlschema # Enumerable group_by, none? -# Process Process.daemon # REXML security fix # String ord # Time to_date, to_time, to_datetime @@ -12,7 +11,6 @@ require 'active_support' require 'active_support/core_ext/date/calculations' require 'active_support/core_ext/date_time/conversions' require 'active_support/core_ext/enumerable' -require 'active_support/core_ext/process/daemon' require 'active_support/core_ext/string/conversions' require 'active_support/core_ext/string/interpolation' require 'active_support/core_ext/string/encoding' |