diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-16 20:36:03 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2015-12-16 20:36:11 +0100 |
| commit | ae48ea69cf378d03ffed0f694587a16696795387 (patch) | |
| tree | caa5a3c5adce3cf747154dfff735bf7b4ae70fac /railties/lib/rails/commands | |
| parent | bf16ec25b30ae501c3ca849b05ae8ad132a45f96 (diff) | |
| download | rails-ae48ea69cf378d03ffed0f694587a16696795387.tar.gz rails-ae48ea69cf378d03ffed0f694587a16696795387.tar.bz2 rails-ae48ea69cf378d03ffed0f694587a16696795387.zip | |
Use puma as the default development server, if available
Diffstat (limited to 'railties/lib/rails/commands')
| -rw-r--r-- | railties/lib/rails/commands/server.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb index d3ea441f8e..6a451861af 100644 --- a/railties/lib/rails/commands/server.rb +++ b/railties/lib/rails/commands/server.rb @@ -12,7 +12,7 @@ module Rails option_parser(options).parse! args options[:log_stdout] = options[:daemonize].blank? && (options[:environment] || Rails.env) == "development" - options[:server] = args.shift + options[:server] = args.shift || defined?(Puma) ? 'puma' : nil options end |