diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2016-03-06 06:58:36 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2016-03-06 06:58:36 +0000 |
| commit | 598816f630aadc5f63c8e36bc16accd6e15d4fb0 (patch) | |
| tree | f5aaa698e7663896a339a86f9802a403d905d059 /activerecord/lib/active_record | |
| parent | a2eb7962d3986c787d8ca66faca57c26617be499 (diff) | |
| parent | b5bdcaa838bb85cf0fdfdaef036409ab3a8d4a91 (diff) | |
| download | rails-598816f630aadc5f63c8e36bc16accd6e15d4fb0.tar.gz rails-598816f630aadc5f63c8e36bc16accd6e15d4fb0.tar.bz2 rails-598816f630aadc5f63c8e36bc16accd6e15d4fb0.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/association_basics.md
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/nested_attributes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb index ae78ceee01..fe68869143 100644 --- a/activerecord/lib/active_record/nested_attributes.rb +++ b/activerecord/lib/active_record/nested_attributes.rb @@ -215,7 +215,7 @@ module ActiveRecord # # The keys of the hash which is the value for +:posts_attributes+ are # ignored in this case. - # However, it is not allowed to use +'id'+ or +:id+ for one of + # However, it is not allowed to use <tt>'id'</tt> or <tt>:id</tt> for one of # such keys, otherwise the hash will be wrapped in an array and # interpreted as an attribute hash for a single post. # |