aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands/server.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-10-14 09:57:41 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-10-14 09:57:41 -0700
commit6338e1e68dfbe77c39eaaa17bb4950ef7db73704 (patch)
tree6bca387ebcc859a5f277a65f268cd885c7e1b00c /railties/lib/rails/commands/server.rb
parent1974911b8d5780ec16e138027a0099bd8482f88f (diff)
parent5ad7f8ab418f0c760dbb584f7c78d94ce32e9ee3 (diff)
downloadrails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.tar.gz
rails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.tar.bz2
rails-6338e1e68dfbe77c39eaaa17bb4950ef7db73704.zip
Merge pull request #7941 from robin850/master
Use 1.9 Hash syntax in railties
Diffstat (limited to 'railties/lib/rails/commands/server.rb')
-rw-r--r--railties/lib/rails/commands/server.rb14
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