Commit 97323faa authored by Yorick Peterse's avatar Yorick Peterse

Merge branch 'tag-authorized-keys' into 'master'

Tag API calls to /internal/authorized_keys

See merge request !396
parents cf09d873 a718bcd1
...@@ -9,6 +9,7 @@ v 8.8.0 (unreleased) ...@@ -9,6 +9,7 @@ v 8.8.0 (unreleased)
- [Elastic] Add rake task for clearing indexing status - [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) - 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 - 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 v 8.7.5
- No EE-specific changes - No EE-specific changes
......
...@@ -58,6 +58,8 @@ module API ...@@ -58,6 +58,8 @@ module API
# Get a ssh key using the fingerprint # Get a ssh key using the fingerprint
# #
get "/authorized_keys" do get "/authorized_keys" do
Gitlab::Metrics.action = 'Grape#/internal/authorized_keys'
fingerprint = params.fetch(:fingerprint) do fingerprint = params.fetch(:fingerprint) do
Gitlab::InsecureKeyFingerprint.new(params.fetch(:key)).fingerprint Gitlab::InsecureKeyFingerprint.new(params.fetch(:key)).fingerprint
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment