aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-04-30 12:11:38 +0200
committerJosé Valim <jose.valim@gmail.com>2010-04-30 12:11:38 +0200
commit7b98d2aa59e301c91d764262bba55133fef3538a (patch)
tree0965f8c87fd4222ecfa053d9547b523c0a57d146 /actionmailer
parentd2a49e4b1f30c5997e169110eed94a55aee53f56 (diff)
downloadrails-7b98d2aa59e301c91d764262bba55133fef3538a.tar.gz
rails-7b98d2aa59e301c91d764262bba55133fef3538a.tar.bz2
rails-7b98d2aa59e301c91d764262bba55133fef3538a.zip
Reorganize the mailer generator a bit.
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/rails/generators/mailer/USAGE (renamed from actionmailer/lib/generators/mailer/USAGE)0
-rw-r--r--actionmailer/lib/rails/generators/mailer/mailer_generator.rb (renamed from actionmailer/lib/generators/mailer_generator.rb)2
-rw-r--r--actionmailer/lib/rails/generators/mailer/templates/mailer.rb (renamed from actionmailer/lib/generators/mailer/templates/mailer.rb)0
3 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/generators/mailer/USAGE b/actionmailer/lib/rails/generators/mailer/USAGE
index a08d459739..a08d459739 100644
--- a/actionmailer/lib/generators/mailer/USAGE
+++ b/actionmailer/lib/rails/generators/mailer/USAGE
diff --git a/actionmailer/lib/generators/mailer_generator.rb b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb
index d3048c3168..8f47539f42 100644
--- a/actionmailer/lib/generators/mailer_generator.rb
+++ b/actionmailer/lib/rails/generators/mailer/mailer_generator.rb
@@ -5,7 +5,7 @@ module Rails
check_class_collision
def self.source_root
- File.expand_path("../mailer/templates", __FILE__)
+ File.expand_path("../templates", __FILE__)
end
def create_mailer_file
diff --git a/actionmailer/lib/generators/mailer/templates/mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
index 7343eb28b3..7343eb28b3 100644
--- a/actionmailer/lib/generators/mailer/templates/mailer.rb
+++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb