Merge pull request #26037 from monmonmon/master

Check if the logger is not nil before using it
This commit is contained in:
Rafael França 2016-08-17 00:07:35 -03:00 committed by GitHub
commit 0549f9debf

@ -174,7 +174,7 @@ def scope(name, body, &block)
protected
def valid_scope_name?(name)
if respond_to?(name, true)
if respond_to?(name, true) && logger
logger.warn "Creating scope :#{name}. " \
"Overwriting existing method #{self.name}.#{name}."
end