diff options
author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-06-10 08:48:49 +0000 |
---|---|---|
committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-06-10 08:48:49 +0000 |
commit | cb140248eab9bf6a1e46f77719408c573f382780 (patch) | |
tree | ce5abcac29289f810a81d0ff88d05739f837e3ac /app | |
parent | ebb73fa258db4440060508d264f9c0557378be71 (diff) | |
download | redmine-cb140248eab9bf6a1e46f77719408c573f382780.tar.gz redmine-cb140248eab9bf6a1e46f77719408c573f382780.zip |
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
Diffstat (limited to 'app')
-rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |