aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/join_dependency.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-02 08:00:33 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-04-02 08:00:33 -0700
commit9030015e99dd5b5b0cefe1c13723f11aab18f057 (patch)
tree27078930a546a23f7d79b2c074edccb1c641ec29 /activerecord/lib/active_record/associations/join_dependency.rb
parent6fee836866ce70215247b4d1ec48730e0ff8cc7c (diff)
parentbe736265f06fc484d99e557ed8dd58934da76d73 (diff)
downloadrails-9030015e99dd5b5b0cefe1c13723f11aab18f057.tar.gz
rails-9030015e99dd5b5b0cefe1c13723f11aab18f057.tar.bz2
rails-9030015e99dd5b5b0cefe1c13723f11aab18f057.zip
Merge pull request #10048 from senny/replace_merge_with_relation_calls_in_count_api
replace #merge with relation API calls in calculations_test.
Diffstat (limited to 'activerecord/lib/active_record/associations/join_dependency.rb')
0 files changed, 0 insertions, 0 deletions