Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:sinatra/sinatra

Conflicts:
	lib/sinatra/base.rb
  • Loading branch information...
commit 5ae2c5f168584b7e7aa6dc9d2a1a2bc2d4729a6f 2 parents 9cfaa26 + ac3a7fd
@rkh rkh authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/sinatra/base.rb
View
4 lib/sinatra/base.rb
@@ -1185,7 +1185,7 @@ def public_dir
public_folder
end
- private
+ private
# Condition for matching host name. Parameter might be String or Regexp.
def host_name(pattern)
condition { pattern === request.host }
@@ -1347,7 +1347,7 @@ def quit!(server, handler_name)
end
# Run the Sinatra app as a self-hosted server using
- # Thin, Mongrel or WEBrick (in that order). If given a block, will call
+ # Thin, Puma, Mongrel, or WEBrick (in that order). If given a block, will call
# with the constructed handler once we have taken the stage.
def run!(options={})
set options
Please sign in to comment.
Something went wrong with that request. Please try again.