Commit ea615534 authored by Robert Speicher's avatar Robert Speicher
Browse files

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

Add "action" tag to /internal/allowed API

See merge request !3791
Please view this file on the master branch, on stable branches it's out of date.
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
- Repository.clean_old_archives is now instrumented
- Add support for environment variables on a job level in CI configuration file
......
......@@ -23,9 +23,11 @@ def wiki?
end
post "/allowed" do
Gitlab::Metrics.tag_transaction('action', 'Grape#/internal/allowed')
status 200
actor =
actor =
if params[:key_id]
Key.find_by(id: params[:key_id])
elsif params[:user_id]
......@@ -33,7 +35,7 @@ def wiki?
end
project_path = params[:project]
# Check for *.wiki repositories.
# Strip out the .wiki from the pathname before finding the
# 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