From 01c54e29bd288bf250b6e277046594f06b211a6f Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Wed, 7 Feb 2018 14:49:24 +0900
Subject: =?UTF-8?q?Revert=20"=E2=9C=82=EF=B8=8F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 487a1061cc496455dfe5ee84d1e49d509c1675b5.

This `#--` is necessary for the doc of `distinct`.

[ci skip]
---
 activerecord/lib/active_record/associations/collection_proxy.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record')

diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index cff30cb027..9a30198b95 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -747,7 +747,8 @@ module ActiveRecord
       #   #      #<Pet name: "Fancy-Fancy">,
       #   #      #<Pet name: "Fancy-Fancy">
       #   #    ]
-      #
+
+      #--
       def calculate(operation, column_name)
         null_scope? ? scope.calculate(operation, column_name) : super
       end
-- 
cgit v1.2.3