Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Use boolean comparators where it makes sense

Browse source
This commit is contained in:
wvengen 2015-01-14 21:15:08 +01:00
parent dbdc7ae4aa
commit 118886344a
28 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -160,7 +160,7 @@ class User < ActiveRecord::Base
end
def self.authenticate(login, password)
user = (find_by_nick(login) or find_by_email(login))
user = find_by_nick(login) || find_by_email(login)
if user && user.has_password(password)
user
else