diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index a5c1963047..4b0d8fc98a 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Plugin generator: check for class collisions. #4833 [vinbarnes@gmail.com] + * Mailer generator: handle mailers in modules, set mime_version in unit test. [Jeremy Kemper] * Set $KCODE to 'u' by default to enable the multibyte safe String#chars proxy. [Koz] diff --git a/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb b/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb index 8a55952ffe..915176ce18 100644 --- a/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb +++ b/railties/lib/rails_generator/generators/components/plugin/plugin_generator.rb @@ -9,6 +9,9 @@ class PluginGenerator < Rails::Generator::NamedBase def manifest record do |m| + # Check for class naming collisions. + m.class_collisions class_path, class_name + m.directory "#{plugin_path}/lib" m.directory "#{plugin_path}/tasks" m.directory "#{plugin_path}/test" |