mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #34997 from alkesh26/typo-fix-webserver 

Replaced webserver with web server
This commit is contained in:
Eileen M. Uchitelle 2019-01-22 11:13:37 -05:00 committed by GitHub
parent 3f0c7c5580 97909ddcf2
commit e26f0658da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/test/dispatch/live_response_test.rb
View File

@ -62,7 +62,7 @@ module ActionController
assert_nil @response.headers["Content-Length"]
end
def test_headers_cannot_be_written_after_webserver_reads
def test_headers_cannot_be_written_after_web_server_reads
@response.stream.write "omg"
latch = Concurrent::CountDownLatch.new

4
railties/lib/rails/generators/app_base.rb
View File

@ -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)