aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/preloader
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2016-08-02 12:28:56 -0700
committerGitHub <noreply@github.com>2016-08-02 12:28:56 -0700
commit2762ebd84629ccc39a9959ecf15c9f82c1d283b3 (patch)
tree30703ec9361dd96053fd0db65fa2796d828f493c /activerecord/lib/active_record/associations/preloader
parent111227c0dfb72b060428063e35d865b62338654a (diff)
parent31c1ed95d33bd9a46a6a4ebb5c1e1fa2af171969 (diff)
downloadrails-2762ebd84629ccc39a9959ecf15c9f82c1d283b3.tar.gz
rails-2762ebd84629ccc39a9959ecf15c9f82c1d283b3.tar.bz2
rails-2762ebd84629ccc39a9959ecf15c9f82c1d283b3.zip
Merge branch 'master' into retry-and-discard-jobs
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader')
0 files changed, 0 insertions, 0 deletions