Commit ea615534 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'tag-grape-allowed' into 'master'

Add "action" tag to /internal/allowed API

See merge request !3791
parents 58665b64 b9698d2b
Please view this file on the master branch, on stable branches it's out of date. Please view this file on the master branch, on stable branches it's out of date.
v 8.7.0 (unreleased) v 8.7.0 (unreleased)
- Transactions for /internal/allowed now have an "action" tag set
- Method instrumentation now uses Module#prepend instead of aliasing methods - Method instrumentation now uses Module#prepend instead of aliasing methods
- Repository.clean_old_archives is now instrumented - Repository.clean_old_archives is now instrumented
- Add support for environment variables on a job level in CI configuration file - Add support for environment variables on a job level in CI configuration file
......
...@@ -23,9 +23,11 @@ module API ...@@ -23,9 +23,11 @@ module API
end end
post "/allowed" do post "/allowed" do
Gitlab::Metrics.tag_transaction('action', 'Grape#/internal/allowed')
status 200 status 200
actor = actor =
if params[:key_id] if params[:key_id]
Key.find_by(id: params[:key_id]) Key.find_by(id: params[:key_id])
elsif params[:user_id] elsif params[:user_id]
...@@ -33,7 +35,7 @@ module API ...@@ -33,7 +35,7 @@ module API
end end
project_path = params[:project] project_path = params[:project]
# Check for *.wiki repositories. # Check for *.wiki repositories.
# Strip out the .wiki from the pathname before finding the # Strip out the .wiki from the pathname before finding the
# project. This applies the correct project permissions to # project. This applies the correct project permissions to
......
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