From 5e406a3311d73473d846030b423aa26fafa021a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 16 Dec 2015 19:35:16 -0200 Subject: No need to check for puma Rack::Server already does it work for us if the server is installed. --- railties/lib/rails/commands/server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties') 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 -- cgit v1.2.3