diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-14 00:31:45 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-14 00:31:45 +0300 |
| commit | 6dbca80c46093443e69f3faace6f1967570b15fa (patch) | |
| tree | d3e351e4ed25c347978f33176c729c0495b7de74 /lib/api/session.rb | |
| parent | 8c058e8563c287817b81a9a122ceeb5a69f6b221 (diff) | |
| parent | 4a8ae77ebac46545fa4811ea60bf53d1e81f10fc (diff) | |
| download | gitlab-ce-remove-comment-toggle.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into remove-comment-toggleremove-comment-toggle
Diffstat (limited to 'lib/api/session.rb')
| -rw-r--r-- | lib/api/session.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/api/session.rb b/lib/api/session.rb index cc646895914..56c202f1294 100644 --- a/lib/api/session.rb +++ b/lib/api/session.rb @@ -11,8 +11,7 @@ module API # Example Request: # POST /session post "/session" do - auth = Gitlab::Auth.new - user = auth.find(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 |