aboutsummaryrefslogtreecommitdiffstats
path: root/rails.gemspec
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-04-04 13:31:10 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-04-04 13:31:10 -0300
commit5f1346b0c7cde53bb849dad89778c80ef1ed6571 (patch)
treebb54fe628c88cc9ec6385f2813734360cef087e2 /rails.gemspec
parentedb6f7db5495e6f683764e5bf5089cecab9cf7cd (diff)
parent1b187caaa1e1aa1bd0f440052b4df09a5ddaa4bf (diff)
downloadrails-5f1346b0c7cde53bb849dad89778c80ef1ed6571.tar.gz
rails-5f1346b0c7cde53bb849dad89778c80ef1ed6571.tar.bz2
rails-5f1346b0c7cde53bb849dad89778c80ef1ed6571.zip
Merge pull request #14562 from jefflai2/collection_proxy
CollectionProxy uses the arel of its association's scope. Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'rails.gemspec')
0 files changed, 0 insertions, 0 deletions