Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
02ad2841
Commit
02ad2841
authored
Jun 20, 2017
by
Matt Walsh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow discover by userid - issue 28517
parent
40cd5082
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
3 deletions
+8
-3
lib/api/internal.rb
lib/api/internal.rb
+8
-3
No files found.
lib/api/internal.rb
View file @
02ad2841
...
...
@@ -71,11 +71,16 @@ module API
end
#
# Discover user by ssh key
# Discover user by ssh key
or user id
#
get
"/discover"
do
key
=
Key
.
find
(
params
[
:key_id
])
present
key
.
user
,
with:
Entities
::
UserSafe
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
end
get
"/check"
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment