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/generators/rails | |
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/generators/rails')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 4384d9b6eb..abb4905294 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -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 |