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
ea615534
Commit
ea615534
authored
Apr 18, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tag-grape-allowed' into 'master'
Add "action" tag to /internal/allowed API See merge request !3791
parents
58665b64
b9698d2b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
CHANGELOG
CHANGELOG
+1
-0
lib/api/internal.rb
lib/api/internal.rb
+4
-2
No files found.
CHANGELOG
View file @
ea615534
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
...
...
lib/api/internal.rb
View file @
ea615534
...
@@ -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
...
...
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