From 487a1061cc496455dfe5ee84d1e49d509c1675b5 Mon Sep 17 00:00:00 2001 From: schneems Date: Tue, 6 Feb 2018 22:28:05 -0600 Subject: =?UTF-8?q?=E2=9C=82=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- activerecord/lib/active_record/associations/collection_proxy.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/associations') diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index 9a30198b95..cff30cb027 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -747,8 +747,7 @@ module ActiveRecord # # #, # # # # # ] - - #-- + # def calculate(operation, column_name) null_scope? ? scope.calculate(operation, column_name) : super end -- cgit v1.2.3