diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-16 19:35:16 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-12-16 19:35:16 -0200 |
| commit | 5e406a3311d73473d846030b423aa26fafa021a2 (patch) | |
| tree | d27acf7dd6e8770805f3b68a2189b7e5eddcf3f4 /railties | |
| parent | 42b9126610b2b9e684af5a28dce68286070eb56a (diff) | |
| download | rails-5e406a3311d73473d846030b423aa26fafa021a2.tar.gz rails-5e406a3311d73473d846030b423aa26fafa021a2.tar.bz2 rails-5e406a3311d73473d846030b423aa26fafa021a2.zip | |
No need to check for puma
Rack::Server already does it work for us if the server is installed.
Diffstat (limited to 'railties')
| -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 6a451861af..d3ea441f8e 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 || defined?(Puma) ? 'puma' : nil + options[:server] = args.shift options end |