diff options
author | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-24 23:59:29 +0100 |
---|---|---|
committer | José Valim and Mikel Lindsaar <pair@programming.com> | 2010-01-24 23:59:29 +0100 |
commit | 90e9e46576c0a8d57887484cd4f3f51b3b6cce3a (patch) | |
tree | de254a8fd31ae36f8b9371c9f0e645c7ed1b727d /railties/lib/generators/rails/metal/templates/metal.rb | |
parent | 0ece244feec236f57fb2f55ea564409f25475923 (diff) | |
parent | 4e96442c4e404141830b2d7f0d850b6556190b39 (diff) | |
download | rails-90e9e46576c0a8d57887484cd4f3f51b3b6cce3a.tar.gz rails-90e9e46576c0a8d57887484cd4f3f51b3b6cce3a.tar.bz2 rails-90e9e46576c0a8d57887484cd4f3f51b3b6cce3a.zip |
Merge branch 'master' of github.com:mikel/rails
Diffstat (limited to 'railties/lib/generators/rails/metal/templates/metal.rb')
-rw-r--r-- | railties/lib/generators/rails/metal/templates/metal.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/generators/rails/metal/templates/metal.rb b/railties/lib/generators/rails/metal/templates/metal.rb index 2f5d4e7593..8cc3f1f258 100644 --- a/railties/lib/generators/rails/metal/templates/metal.rb +++ b/railties/lib/generators/rails/metal/templates/metal.rb @@ -1,5 +1,5 @@ # Allow the metal piece to run in isolation -require File.expand_path('../../../config/environment', __FILE__) +require File.expand_path('../../../config/environment', __FILE__) unless defined?(Rails) class <%= class_name %> def self.call(env) |