diff options
| author | Matthew Eagar <meagar@gmail.com> | 2017-01-26 08:32:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-26 08:32:05 -0500 |
| commit | 4cf981f84637022bcf225afd3f13e088d3b0d154 (patch) | |
| tree | 88421e27bcf10b4dc4ae0beae62d2e8c198b8454 /railties/lib | |
| parent | 255babc98b650db7469653aba6405a60efc9e608 (diff) | |
| parent | f543b97fcc52168119d4e016eb50afbda702e601 (diff) | |
| download | rails-4cf981f84637022bcf225afd3f13e088d3b0d154.tar.gz rails-4cf981f84637022bcf225afd3f13e088d3b0d154.tar.bz2 rails-4cf981f84637022bcf225afd3f13e088d3b0d154.zip | |
Merge branch 'master' into fix-missing-partial-iteration
Diffstat (limited to 'railties/lib')
| -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 978b053308..e7cb722473 100644 --- a/railties/lib/rails/generators/resource_helpers.rb +++ b/railties/lib/rails/generators/resource_helpers.rb @@ -59,7 +59,7 @@ module Rails end # Loads the ORM::Generators::ActiveModel class. This class is responsible - # to tell scaffold entities how to generate an specific method for the + # to tell scaffold entities how to generate a specific method for the # ORM. Check Rails::Generators::ActiveModel for more information. def orm_class @orm_class ||= begin |