diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-10-03 06:21:05 -0700 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-10-03 06:21:05 -0700 |
| commit | e8b9712d89f681049f8d537b8ef7f2a4295f102b (patch) | |
| tree | c1a97bce7becd8bd4e87eb0b626e7db18f7f67aa | |
| parent | 37868d7bd671ab60e10602fe8e94426920132ef3 (diff) | |
| parent | 9d622bd790578e58a72424cd637ab40c87a7073e (diff) | |
| download | gitlab-ce-e8b9712d89f681049f8d537b8ef7f2a4295f102b.tar.gz | |
Merge pull request #5262 from yatish27/master
Typo:Corrected the typo of sign-in in User Model
| -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 f1f93eadc1a..c61b074f504 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -167,7 +167,7 @@ class User < ActiveRecord::Base # Class methods # 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) conditions = warden_conditions.dup if login = conditions.delete(:login) |