diff options
| author | Xavier Noria <fxn@hashref.com> | 2016-08-09 23:53:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 23:53:54 +0200 |
| commit | 7b31b06d4afd73734ac54cbbac105f0eab8d0d43 (patch) | |
| tree | 94789c1c7f3c8e1c611a30548cd90ecbb34f98ea /railties/lib/rails/commands | |
| parent | 67d0c9ee93100dbdcafd20b0632e5bef6735888e (diff) | |
| parent | f006de5dc5a709f5dc8604ebd43f7741da30cd9f (diff) | |
| download | rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.gz rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.tar.bz2 rails-7b31b06d4afd73734ac54cbbac105f0eab8d0d43.zip | |
Merge pull request #26095 from kamipo/fix_broken_alignment_by_auto_correct
Fix broken alignments caused by auto-correct commit 411ccbd
Diffstat (limited to 'railties/lib/rails/commands')
| -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 bf8ae0a5ee..0339849bfe 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -88,7 +88,8 @@ module Rails end def default_options - super.merge( Port: ENV.fetch("PORT", 3000).to_i, + super.merge( + Port: ENV.fetch("PORT", 3000).to_i, Host: ENV.fetch("HOST", "localhost").dup, DoNotReverseLookup: true, environment: (ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development").dup, |