diff options
| author | Jeff Kreeftmeijer <jeff@kreeftmeijer.nl> | 2010-10-14 21:23:19 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-11-11 17:24:23 +0100 |
| commit | 154e5d735efcc840c3be52a19b1f8a89eeb2e9e9 (patch) | |
| tree | 1ae8aec68487824d3d98db2c6f82fb0ea0e26d84 /railties/lib/rails/generators/resource_helpers.rb | |
| parent | fbaf3a23d909bca79bae3ebb77249483fcab5383 (diff) | |
| download | rails-154e5d735efcc840c3be52a19b1f8a89eeb2e9e9.tar.gz rails-154e5d735efcc840c3be52a19b1f8a89eeb2e9e9.tar.bz2 rails-154e5d735efcc840c3be52a19b1f8a89eeb2e9e9.zip | |
The model generator shouldn't throw warnings when using mass nouns [#5363 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'railties/lib/rails/generators/resource_helpers.rb')
| -rw-r--r-- | railties/lib/rails/generators/resource_helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb index 829f4b200a..8400171aa1 100644 --- a/railties/lib/rails/generators/resource_helpers.rb +++ b/railties/lib/rails/generators/resource_helpers.rb @@ -17,7 +17,7 @@ module Rails def initialize(*args) #:nodoc: super - if name == name.pluralize && !options[:force_plural] + if name == name.pluralize && name.singularize != name.pluralize && !options[:force_plural] unless ResourceHelpers.skip_warn say "Plural version of the model detected, using singularized version. Override with --force-plural." ResourceHelpers.skip_warn = true |