diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-24 01:33:18 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-24 01:33:18 +0530 |
| commit | efd0bd3b7390ebb8526b981169025f2860f6a113 (patch) | |
| tree | 1cb3bcd8f9534f64e8a764af1010ce65303b42b0 /railties/lib/generators/rails/metal/templates/metal.rb | |
| parent | f4571e3617ccd9cc9e5ee9f7431066bd80395e22 (diff) | |
| parent | 8ff2fb6f3aa6140f5a8bd018d5919a8a1e707cda (diff) | |
| download | rails-efd0bd3b7390ebb8526b981169025f2860f6a113.tar.gz rails-efd0bd3b7390ebb8526b981169025f2860f6a113.tar.bz2 rails-efd0bd3b7390ebb8526b981169025f2860f6a113.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'railties/lib/generators/rails/metal/templates/metal.rb')
| -rw-r--r-- | railties/lib/generators/rails/metal/templates/metal.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/generators/rails/metal/templates/metal.rb b/railties/lib/generators/rails/metal/templates/metal.rb index e94982b69a..2f5d4e7593 100644 --- a/railties/lib/generators/rails/metal/templates/metal.rb +++ b/railties/lib/generators/rails/metal/templates/metal.rb @@ -1,12 +1,12 @@ # Allow the metal piece to run in isolation -require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Rails) +require File.expand_path('../../../config/environment', __FILE__) class <%= class_name %> def self.call(env) if env["PATH_INFO"] =~ /^\/<%= file_name %>/ [200, {"Content-Type" => "text/html"}, ["Hello, World!"]] else - [404, {"Content-Type" => "text/html"}, ["Not Found"]] + [404, {"Content-Type" => "text/html", "X-Cascade" => "pass"}, ["Not Found"]] end end end |