diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-01-28 17:17:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-28 17:17:19 -0800 |
| commit | ed7706720e74293b310898df1bc202ae505b9731 (patch) | |
| tree | 19a0f03bfd05955c90f2169c7ec27edb16f7faa9 /activerecord | |
| parent | b8baa15adb1eccb49d2cfa16616e24095a012ba5 (diff) | |
| parent | 736db1586e559bfa104d8486558cd8108b26d166 (diff) | |
| download | rails-ed7706720e74293b310898df1bc202ae505b9731.tar.gz rails-ed7706720e74293b310898df1bc202ae505b9731.tar.bz2 rails-ed7706720e74293b310898df1bc202ae505b9731.zip | |
Merge pull request #35076 from rails/more-ro-objects
More Read-Only Changes
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/railties/collection_cache_association_loading.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railties/collection_cache_association_loading.rb b/activerecord/lib/active_record/railties/collection_cache_association_loading.rb index b5129e4239..dfaac4eefb 100644 --- a/activerecord/lib/active_record/railties/collection_cache_association_loading.rb +++ b/activerecord/lib/active_record/railties/collection_cache_association_loading.rb @@ -20,12 +20,12 @@ module ActiveRecord end end - def collection_without_template + def collection_without_template(*) @relation.preload_associations(@collection) if @relation super end - def collection_with_template + def collection_with_template(*) @relation.preload_associations(@collection) if @relation super end |