root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5262 from yatish27/master 

Typo:Corrected the typo of sign-in in User Model
This commit is contained in:
Jacob Vosmaer 2013-10-03 06:21:05 -07:00
parent 37868d7bd6 9d622bd790
commit e8b9712d89
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -167,7 +167,7 @@ class User < ActiveRecord::Base
# Class methods # Class methods
# #
class << self class << self
# Devise method overridden to allow sing in with email or username # Devise method overridden to allow sign in with email or username
def find_for_database_authentication(warden_conditions) def find_for_database_authentication(warden_conditions)
conditions = warden_conditions.dup conditions = warden_conditions.dup
if login = conditions.delete(:login) if login = conditions.delete(:login)