Merge remote branch 'fxn/master'

2010-02-06 13:03:41 -08:00 · 2010-02-06 13:03:41 -08:00 · 9423c2a7d8
parent 3caca406c8 bd5cb0562e
commit 9423c2a7d8
3 changed files with 2 additions and 8 deletions
--- a/activesupport/lib/active_support/core_ext/kernel.rb
+++ b/activesupport/lib/active_support/core_ext/kernel.rb
@ -1,4 +1,3 @@
-require 'active_support/core_ext/kernel/daemonizing'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/kernel/agnostics'
 require 'active_support/core_ext/kernel/requires'
--- a/activesupport/lib/active_support/core_ext/kernel/daemonizing.rb
+++ b/activesupport/lib/active_support/core_ext/kernel/daemonizing.rb
@ -1,7 +0,0 @@
-module Kernel
-  # Turns the current script into a daemon process that detaches from the console.
-  # It can be shut down with a TERM signal.
-  def daemonize
-    Process.daemon
-  end
-end
--- a/railties/lib/rails/rack/debugger.rb
+++ b/railties/lib/rails/rack/debugger.rb
@ -1,3 +1,5 @@
+require 'active_support/core_ext/kernel/requires'
+
 module Rails
  module Rack
    class Debugger