From cb140248eab9bf6a1e46f77719408c573f382780 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 10 Jun 2013 08:48:49 +0000 Subject: [PATCH] remove trailing white-space from app/models/user.rb git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11954 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 8ad717042..5c1a98866 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -167,7 +167,7 @@ class User < Principal if user # user is already in local database return nil unless user.check_password?(password) - return nil if !user.active? && active_only + return nil if !user.active? && active_only else # user is not yet registered, try to authenticate with available sources attrs = AuthSource.authenticate(login, password)