diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-23 19:45:25 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-23 19:45:25 +1100 |
| commit | 1ea84c38ea5b40642f3dcdb5ffca1c6fc9cc604d (patch) | |
| tree | 750e10199be244bb5676ea615dbf49dee38b7fd4 /railties/lib/generators/rails/metal/templates/metal.rb | |
| parent | bd24c75fc619fa80af03662cc4dd18fc9b70cafb (diff) | |
| parent | 8ff2fb6f3aa6140f5a8bd018d5919a8a1e707cda (diff) | |
| download | rails-1ea84c38ea5b40642f3dcdb5ffca1c6fc9cc604d.tar.gz rails-1ea84c38ea5b40642f3dcdb5ffca1c6fc9cc604d.tar.bz2 rails-1ea84c38ea5b40642f3dcdb5ffca1c6fc9cc604d.zip | |
Merge branch 'master' of git://github.com/rails/rails
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 |