diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-16 12:12:27 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-16 12:12:28 +0200 |
| commit | 13e37a3ee5c943525a99481b855d654e97e8597c (patch) | |
| tree | 21cd6acfe884046eeb32bc23095b6a2f9f02c8cb /lib/api/session.rb | |
| parent | 9be06bbbb40a64b060fe9042fc84817551dfed08 (diff) | |
| download | gitlab-ce-13e37a3ee5c943525a99481b855d654e97e8597c.tar.gz | |
squashed merge and fixed conflicts
Diffstat (limited to 'lib/api/session.rb')
| -rw-r--r-- | lib/api/session.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/session.rb b/lib/api/session.rb index 56e69b2366f..56c202f1294 100644 --- a/lib/api/session.rb +++ b/lib/api/session.rb @@ -11,7 +11,7 @@ module API # Example Request: # POST /session post "/session" do - user = Gitlab::Auth.find_in_gitlab_or_ldap(params[:email] || params[:login], params[:password]) + user = Gitlab::Auth.find_with_user_password(params[:email] || params[:login], params[:password]) return unauthorized! unless user present user, with: Entities::UserLogin |