diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-20 23:13:19 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-20 23:13:19 +0200 |
| commit | 207fa59675cb624dde0e01c1d57597f752cdf095 (patch) | |
| tree | 472d03af5bc3e2df1b759717f723ca914f2a77aa /railties/lib/rails/commands/server.rb | |
| parent | 31cadc730a40281950a265ff6982dd76cc326828 (diff) | |
| parent | 50d37a76064239a731f81a4ba68b80946c4dfae2 (diff) | |
| download | rails-207fa59675cb624dde0e01c1d57597f752cdf095.tar.gz rails-207fa59675cb624dde0e01c1d57597f752cdf095.tar.bz2 rails-207fa59675cb624dde0e01c1d57597f752cdf095.zip | |
Merge remote branch 'rails/master'
Conflicts:
actionpack/lib/abstract_controller/base.rb
Diffstat (limited to 'railties/lib/rails/commands/server.rb')
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index 3f74cd49fc..cb9b871875 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -83,7 +83,8 @@ module Rails :environment => (ENV['RAILS_ENV'] || "development").dup, :daemonize => false, :debugger => false, - :pid => "tmp/pids/server.pid" + :pid => File.expand_path("tmp/pids/server.pid"), + :config => File.expand_path("config.ru") }) end end |