diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-21 07:47:41 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-06-21 07:47:41 +0000 |
| commit | 5213bf2bf713f1647c05821d42afea90d93a57b6 (patch) | |
| tree | 4224004367013ba02b5bba24bdfcda3bb03ae4e8 /lib/api/internal.rb | |
| parent | 1578ee93475c0ebb62399403d971e99aa45e7276 (diff) | |
| download | gitlab-ce-revert-1578ee93.tar.gz | |
Revert "Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce"revert-1578ee93
This reverts commit 1578ee93475c0ebb62399403d971e99aa45e7276
Diffstat (limited to 'lib/api/internal.rb')
| -rw-r--r-- | lib/api/internal.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 479ee16a611..9ec418edea4 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -71,16 +71,11 @@ module API end # - # Discover user by ssh key or user id + # Discover user by ssh key # get "/discover" do - if params[:key_id] - key = Key.find(params[:key_id]) - user = key.user - elsif params[:user_id] - user = User.find_by(id: params[:user_id]) - end - present user, with: Entities::UserSafe + key = Key.find(params[:key_id]) + present key.user, with: Entities::UserSafe end get "/check" do |