Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
e8b9712d
Commit
e8b9712d
authored
Oct 03, 2013
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5262 from yatish27/master
Typo:Corrected the typo of sign-in in User Model
parents
37868d7b
9d622bd7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/models/user.rb
app/models/user.rb
+1
-1
No files found.
app/models/user.rb
View file @
e8b9712d
...
@@ -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 si
ng
in with email or username
# Devise method overridden to allow si
gn
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment