diff options
| -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 | ||||
| -rw-r--r-- | railties/test/generators/mailer_generator_test.rb | 2 |
4 files changed, 2 insertions, 2 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 diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb index 298c45b6ac..850b45ff74 100644 --- a/railties/test/generators/mailer_generator_test.rb +++ b/railties/test/generators/mailer_generator_test.rb @@ -1,5 +1,5 @@ require 'generators/generators_test_helper' -require 'generators/mailer_generator' +require 'rails/generators/mailer/mailer_generator' class MailerGeneratorTest < Rails::Generators::TestCase |