diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2010-02-06 13:31:22 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-02-06 13:31:22 -0800 |
| commit | 5995482be90dbec091ec1259774a45b30e0e2ea7 (patch) | |
| tree | f045bb4fbce84b745fc78e15242c243ef40ca749 | |
| parent | 28fe0c330a2081b1709522274c0b1b193e50ee20 (diff) | |
| parent | 9423c2a7d88207e7c786a13ad1713ee9dd0044a3 (diff) | |
| download | rails-5995482be90dbec091ec1259774a45b30e0e2ea7.tar.gz rails-5995482be90dbec091ec1259774a45b30e0e2ea7.tar.bz2 rails-5995482be90dbec091ec1259774a45b30e0e2ea7.zip | |
Merge branch 'master' of github.com:rails/rails
| -rw-r--r-- | activesupport/lib/active_support/core_ext/kernel.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/kernel/daemonizing.rb | 7 | ||||
| -rw-r--r-- | railties/lib/rails/rack/debugger.rb | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/activesupport/lib/active_support/core_ext/kernel.rb b/activesupport/lib/active_support/core_ext/kernel.rb index 1922d804bf..c3bed14f63 100644 --- 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' diff --git a/activesupport/lib/active_support/core_ext/kernel/daemonizing.rb b/activesupport/lib/active_support/core_ext/kernel/daemonizing.rb deleted file mode 100644 index ed9d1f9bf2..0000000000 --- a/activesupport/lib/active_support/core_ext/kernel/daemonizing.rb +++ /dev/null @@ -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 diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb index c0448f65e6..06e23db5f1 100644 --- 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 |