diff options
| author | Joshua Peek <josh@joshpeek.com> | 2012-10-15 10:20:50 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2012-10-15 10:20:50 -0500 |
| commit | c800e27ad35ec46f32b5ac4428e5cf7141f95105 (patch) | |
| tree | 0821e0afaba2a74dec6ea1397ee3cabfd3d10c59 /railties/lib/rails/commands/server.rb | |
| parent | 7dba1599d9092a8362956a3fab23b2c60eedea63 (diff) | |
| parent | 46dc6e7786222865309d15a9eaaaf55e3b7d9c1f (diff) | |
| download | rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.gz rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.bz2 rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.zip | |
Merge branch 'master' into asset-path-helper
Conflicts:
railties/test/application/configuration_test.rb
Diffstat (limited to 'railties/lib/rails/commands/server.rb')
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index a684129353..80fdc06cd2 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -105,13 +105,13 @@ module Rails def default_options super.merge({ - :Port => 3000, - :DoNotReverseLookup => true, - :environment => (ENV['RAILS_ENV'] || "development").dup, - :daemonize => false, - :debugger => false, - :pid => File.expand_path("tmp/pids/server.pid"), - :config => File.expand_path("config.ru") + Port: 3000, + DoNotReverseLookup: true, + environment: (ENV['RAILS_ENV'] || "development").dup, + daemonize: false, + debugger: false, + pid: File.expand_path("tmp/pids/server.pid"), + config: File.expand_path("config.ru") }) end end |