Permalink
Browse files

Use puma as the default development server, if available

  • Loading branch information...
dhh committed Dec 16, 2015
1 parent bf16ec2 commit ae48ea69cf378d03ffed0f694587a16696795387
@@ -12,7 +12,7 @@ def parse!(args)
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
@@ -12,12 +12,12 @@ source 'https://rubygems.org'
<% end -%>
<% end -%>
+# Use Puma as the app server
+gem 'puma', github: 'puma/puma' # FIXME: Release Rack 2 compatible Puma
+
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
-# Use Unicorn as the app server
-# gem 'unicorn'
-
# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

0 comments on commit ae48ea6

Please sign in to comment.