diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-29 10:15:37 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-29 10:16:17 -0600 |
| commit | 5243946017d09afff4d70d273b0fcdfd41a4b22a (patch) | |
| tree | 31aa9dad378b7502a92d1aa945eba55203906dfa /activerecord/lib/active_record/associations/preloader/association.rb | |
| parent | 7b2d2a6a0ef9d078062fcd423e1c3749ab20ceb7 (diff) | |
| download | rails-5243946017d09afff4d70d273b0fcdfd41a4b22a.tar.gz rails-5243946017d09afff4d70d273b0fcdfd41a4b22a.tar.bz2 rails-5243946017d09afff4d70d273b0fcdfd41a4b22a.zip | |
Revert "Merge pull request #22026 from akihiro17/fix-preload-association"
This reverts commit 6dc6a0b17cfaf7cb6aa2b1c163b6ca141b538a8e, reversing
changes made to ec94f00ba3cf250eb54fc5b7a5e3ed4b90164f34.
This pull request broke the build.
Diffstat (limited to 'activerecord/lib/active_record/associations/preloader/association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader/association.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index c43f13f3c4..29dd0643d6 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -136,10 +136,6 @@ module ActiveRecord end scope.order! preload_values[:order] || values[:order] - if preload_values[:reordering] || values[:reordering] - scope.reordering_value = true - end - if preload_values[:readonly] || values[:readonly] scope.readonly! end |