diff options
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | arel | 6 | ||||
| m--------- | rack-mount | 0 | ||||
| -rw-r--r-- | railties/lib/rails/application.rb | 5 | ||||
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 4 |
5 files changed, 19 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..20ed3ed9c9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "arel"] + path = arel + url = git://github.com/rails/arel.git +[submodule "rack-mount"] + path = rack-mount + url = git://github.com/rails/rack-mount.git diff --git a/arel b/arel new file mode 160000 +Subproject 0faeb5047407348533db952d9cf93ea59d2526d diff --git a/rack-mount b/rack-mount new file mode 160000 +Subproject 3784e633b42f43a4131e02519be60080d179da2 diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 10cba8ab6c..7c2d8eab67 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -3,6 +3,11 @@ module Rails include Initializable class << self + def inherited(klass) + Rails.application ||= klass unless klass.name =~ /Rails/ + super + end + # Stub out App initialize def initialize! new diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 29359e49a4..2c90851fb2 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -1,4 +1,4 @@ -require 'action_controller' +require 'action_dispatch' require 'fileutils' require 'optparse' @@ -42,7 +42,7 @@ unless server end puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}" -puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}}" +puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}" if options[:detach] Process.daemon |