diff options
| author | alkesh26 <alkesh26@gmail.com> | 2019-01-22 21:11:03 +0530 |
|---|---|---|
| committer | alkesh26 <alkesh26@gmail.com> | 2019-01-22 21:11:03 +0530 |
| commit | 97909ddcf22671aee0f1ba26c471cc069e737e29 (patch) | |
| tree | 5fe2e8acfbeebf7b081efee585cbbd51691814cf /railties | |
| parent | 31e118c39dc50a5ffeffe2b745a26b4c56651a35 (diff) | |
| download | rails-97909ddcf22671aee0f1ba26c471cc069e737e29.tar.gz rails-97909ddcf22671aee0f1ba26c471cc069e737e29.tar.bz2 rails-97909ddcf22671aee0f1ba26c471cc069e737e29.zip | |
Changed webserver to web server.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 0023a9a6a6..0eed552042 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -128,7 +128,7 @@ module Rails def gemfile_entries # :doc: [rails_gemfile_entry, database_gemfile_entry, - webserver_gemfile_entry, + web_server_gemfile_entry, assets_gemfile_entry, webpacker_gemfile_entry, javascript_gemfile_entry, @@ -189,7 +189,7 @@ module Rails "Use #{options[:database]} as the database for Active Record" end - def webserver_gemfile_entry # :doc: + def web_server_gemfile_entry # :doc: return [] if options[:skip_puma] comment = "Use Puma as the app server" GemfileEntry.new("puma", "~> 3.11", comment) diff --git a/railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt index f6146e7259..649253aeca 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/puma.rb.tt @@ -17,7 +17,7 @@ port ENV.fetch("PORT") { 3000 } environment ENV.fetch("RAILS_ENV") { "development" } # Specifies the number of `workers` to boot in clustered mode. -# Workers are forked webserver processes. If using threads and workers together +# Workers are forked web server processes. If using threads and workers together # the concurrency of the application would be max `threads` * `workers`. # Workers do not work on JRuby or Windows (both of which do not support # processes). |