mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
Damn trotter and his bum patches. :-)
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@128 19e92222-5c0b-0410-8929-a290d50e31e9
This commit is contained in:
parent
e0860470ca
commit
acd63226fe
1 changed files with 2 additions and 1 deletions
|
@ -103,6 +103,7 @@ module Mongrel
|
||||||
#
|
#
|
||||||
# * :docroot => The public dir to serve from.
|
# * :docroot => The public dir to serve from.
|
||||||
# * :environment => Rails environment to use.
|
# * :environment => Rails environment to use.
|
||||||
|
# * :cwd => The change to working directory
|
||||||
#
|
#
|
||||||
# And understands the following optional settings:
|
# And understands the following optional settings:
|
||||||
#
|
#
|
||||||
|
@ -131,7 +132,7 @@ module Mongrel
|
||||||
|
|
||||||
$orig_dollar_quote = $".clone
|
$orig_dollar_quote = $".clone
|
||||||
ENV['RAILS_ENV'] = ops[:environment]
|
ENV['RAILS_ENV'] = ops[:environment]
|
||||||
require '#{ops[:docroot]}/config/environment'
|
require "#{ops[:cwd]}/config/environment"
|
||||||
require 'dispatcher'
|
require 'dispatcher'
|
||||||
require 'mongrel/rails'
|
require 'mongrel/rails'
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue