From 5c14eb0b4ea3bde067bc8fce7ed99f5f10ab16ff Mon Sep 17 00:00:00 2001
From: Kasper Timm Hansen <kaspth@gmail.com>
Date: Fri, 24 May 2019 22:54:20 +0200
Subject: Address 639d7be. Readd changelog line; remove needless explicit
 return.

---
 activesupport/lib/active_support/core_ext/module/delegation.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'activesupport/lib/active_support/core_ext/module/delegation.rb')

diff --git a/activesupport/lib/active_support/core_ext/module/delegation.rb b/activesupport/lib/active_support/core_ext/module/delegation.rb
index 2f88010d27..b8996ecb10 100644
--- a/activesupport/lib/active_support/core_ext/module/delegation.rb
+++ b/activesupport/lib/active_support/core_ext/module/delegation.rb
@@ -297,7 +297,7 @@ class Module
           rescue NoMethodError
             if #{target}.nil?
               if #{allow_nil == true}
-                return nil
+                nil
               else
                 raise DelegationError, "\#{method} delegated to #{target}, but #{target} is nil"
               end
-- 
cgit v1.2.3