aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/merger.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-04-14 11:49:36 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-04-14 11:49:36 -0700
commit316ee25c25a64a2d82c284293a31804077b05d79 (patch)
tree4d3d6051f6edb291cd435b9d330b8e23fe56eb0f /activerecord/lib/active_record/relation/merger.rb
parent09608ce9d236c6a9439cf011a3442e1492d0732e (diff)
parenta1e2db2e9bb4ca2fdf6190aa8f448fe85cf76529 (diff)
downloadrails-316ee25c25a64a2d82c284293a31804077b05d79.tar.gz
rails-316ee25c25a64a2d82c284293a31804077b05d79.tar.bz2
rails-316ee25c25a64a2d82c284293a31804077b05d79.zip
Merge branch 'master' into adequaterecord
* master: (70 commits) [ci skip] Added link to ruby-lang.org installation. Use the index on hidden field `collection_check_boxes` respects `:index` option for the hidden filed name. docs, double meaning of `serialize` argument. Closes #14284. Just call read_attribute, no need to use `send`. - Fix lingering reference to `:text` instead of the newer `:plain` - Section references `form_tag` instead of the `form_for` used in the example again, read_attribute is public, so just call it read_attribute is public, so we should just call it Disable assest cache store in docs [ci skip] Make counter cache decrementation on destroy idempotent Write the failing test case for concurrent counter cache [ci skip] Use plain underscore instead of "\_". Update documentation to use Rails.application instead Add a changelog entry for #14546 [ci skip] Move tests for deep_dup and duplicable to object directory Missing 'are' in note - [ci skip] CollectionHelpers now accepts a readonly option Fix a few typos [ci skip] Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows). don't bother with an offset if the offset is zero ...
Diffstat (limited to 'activerecord/lib/active_record/relation/merger.rb')
0 files changed, 0 insertions, 0 deletions