summaryrefslogtreecommitdiff
path: root/lib/api/session.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-04-29 18:58:55 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-04-29 18:58:55 +0200
commitb1ffc9f0fee16251899e5a2efbc78c4781ef4902 (patch)
treee5533f2b8a6aba9a69603b040727c2ada5a938c0 /lib/api/session.rb
parent9ef50db6279d722caed1ab1e4576275428e6a94f (diff)
downloadgitlab-ce-b1ffc9f0fee16251899e5a2efbc78c4781ef4902.tar.gz
Make CI/Oauth/rate limiting reusable
Diffstat (limited to 'lib/api/session.rb')
-rw-r--r--lib/api/session.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/api/session.rb b/lib/api/session.rb
index cc646895914..e308ccc3004 100644
--- a/lib/api/session.rb
+++ b/lib/api/session.rb
@@ -11,8 +11,12 @@ 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(
+ params[:email] || params[:login],
+ params[:password],
+ project: nil,
+ ip: request.ip
+ )
return unauthorized! unless user
present user, with: Entities::UserLogin