diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-01 13:00:34 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-01 13:00:34 -0200 |
| commit | c2e97cb410d759f383d29920165abdbf4b70e019 (patch) | |
| tree | b375de84add24ee4c4551deec533b0667512bf34 /railties/lib/rails | |
| parent | fc3629f6ca2b43693f5447a1fb43881f1814e117 (diff) | |
| parent | 6ac32a83283f46b55675ddf4ecab6c91f6f8abde (diff) | |
| download | rails-c2e97cb410d759f383d29920165abdbf4b70e019.tar.gz rails-c2e97cb410d759f383d29920165abdbf4b70e019.tar.bz2 rails-c2e97cb410d759f383d29920165abdbf4b70e019.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt b/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt index 675f00043f..d8757460e4 100644 --- a/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt +++ b/railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt @@ -1,5 +1,5 @@ class <%= class_name %>Generator < Rails::Generators::NamedBase def self.source_root - @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates')) + @source_root ||= File.expand_path('../templates', __FILE__) end end |