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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
97323faa
Commit
97323faa
authored
May 13, 2016
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tag-authorized-keys' into 'master'
Tag API calls to /internal/authorized_keys See merge request !396
parents
cf09d873
a718bcd1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
CHANGELOG-EE
CHANGELOG-EE
+1
-0
lib/api/internal.rb
lib/api/internal.rb
+2
-0
No files found.
CHANGELOG-EE
View file @
97323faa
...
...
@@ -9,6 +9,7 @@ v 8.8.0 (unreleased)
- [Elastic] Add rake task for clearing indexing status
- Set KRB5 as default clone protocol when Kerberos is enabled and user is logged in (Borja Aparicio)
- Reduce emails-on-push HTML size by using a simple monospace font
- API requests to /internal/authorized_keys are now tagged properly
v 8.7.5
- No EE-specific changes
...
...
lib/api/internal.rb
View file @
97323faa
...
...
@@ -58,6 +58,8 @@ module API
# Get a ssh key using the fingerprint
#
get
"/authorized_keys"
do
Gitlab
::
Metrics
.
action
=
'Grape#/internal/authorized_keys'
fingerprint
=
params
.
fetch
(
:fingerprint
)
do
Gitlab
::
InsecureKeyFingerprint
.
new
(
params
.
fetch
(
:key
)).
fingerprint
end
...
...
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