Commit e8b9712d authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge pull request #5262 from yatish27/master

Typo:Corrected the typo of sign-in in User Model
parents 37868d7b 9d622bd7
...@@ -167,7 +167,7 @@ class User < ActiveRecord::Base ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment