diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-03 10:33:20 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-03 10:33:20 -0700 |
| commit | f3f7f31407eacc8d44b550aaa773ae802979f8ed (patch) | |
| tree | c99269d5d1ed9409195c6aaf658ec90496558629 /railties | |
| parent | d6e1d6d7b5751703e9867f04a5f12c928b8af7bc (diff) | |
| parent | 822d99562777f7d0ab2b79cacaec47690f6271e6 (diff) | |
| download | rails-f3f7f31407eacc8d44b550aaa773ae802979f8ed.tar.gz rails-f3f7f31407eacc8d44b550aaa773ae802979f8ed.tar.bz2 rails-f3f7f31407eacc8d44b550aaa773ae802979f8ed.zip | |
Merge pull request #11272 from vipulnsward/generator_update
Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attribute`
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | railties/lib/rails/generators/active_model.rb | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index a3f5796b2c..2fbdf6d12b 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +* Remove deprecated `ActiveRecord::Generators::ActiveModel#update_attributes` in + favor of `ActiveRecord::Generators::ActiveModel#update` + + *Vipul A M* + * Remove deprecated `config.whiny_nils` option *Vipul A M* diff --git a/railties/lib/rails/generators/active_model.rb b/railties/lib/rails/generators/active_model.rb index e5373704d7..b6f8687d49 100644 --- a/railties/lib/rails/generators/active_model.rb +++ b/railties/lib/rails/generators/active_model.rb @@ -65,12 +65,6 @@ module Rails "#{name}.update(#{params})" end - def update_attributes(*args) # :nodoc: - ActiveSupport::Deprecation.warn("Calling '@orm_instance.update_attributes' " \ - "is deprecated, please use '@orm_instance.update' instead.") - update(*args) - end - # POST create # PATCH/PUT update def errors |