diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-09-20 19:35:56 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-09-20 19:35:56 +0300 |
| commit | 49fe8fed11d5a8b73e15b507b214ea10b61524a5 (patch) | |
| tree | 64569541bef730f8ef7bf321261ffb8ffe2be470 /lib/api/session.rb | |
| parent | a605943d76216f2c5e78178c2b87ed92ff79741f (diff) | |
| parent | d12579aa43372bdaa5989eee95db9c10e89befe7 (diff) | |
| download | gitlab-ce-49fe8fed11d5a8b73e15b507b214ea10b61524a5.tar.gz | |
Merge branch 'api'
Diffstat (limited to 'lib/api/session.rb')
| -rw-r--r-- | lib/api/session.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/api/session.rb b/lib/api/session.rb index 5bcdf93abe9..b4050160ae4 100644 --- a/lib/api/session.rb +++ b/lib/api/session.rb @@ -8,14 +8,13 @@ module Gitlab post "/session" do resource = User.find_for_database_authentication(email: params[:email]) - return forbidden! unless resource + return unauthorized! unless resource if resource.valid_password?(params[:password]) present resource, with: Entities::UserLogin else - forbidden! + unauthorized! end end end end - |