From 3f7cd2c57151f9873f6e2a06dd020447fd7e360a Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sat, 10 Dec 2016 21:40:20 +0900 Subject: Fix CI failure caused by #25227 and #25280 were merged at the same time --- activerecord/lib/active_record/associations/singular_association.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb index 6d69f757eb..ee7b7c8bea 100644 --- a/activerecord/lib/active_record/associations/singular_association.rb +++ b/activerecord/lib/active_record/associations/singular_association.rb @@ -58,7 +58,7 @@ module ActiveRecord sc.execute(binds, klass, conn) do |record| set_inverse_instance record end.first - rescue RangeError + rescue ::RangeError nil end -- cgit v1.2.3