diff options
| author | David Turner <dturner@twosigma.com> | 2017-08-03 14:38:33 -0400 |
|---|---|---|
| committer | David Turner <novalis@novalis.org> | 2017-09-29 18:16:55 -0400 |
| commit | 01ce58bde4ddb9bdf3c54dbd2cc65f7a6b81661e (patch) | |
| tree | bf4a2f8c34e09a5577b4935c0fed0c5d9eb8a7c1 /lib/api/internal.rb | |
| parent | dbcf48af8b21c0f1e54b73ea421911028081e1c1 (diff) | |
| download | gitlab-ce-01ce58bde4ddb9bdf3c54dbd2cc65f7a6b81661e.tar.gz | |
add username to authorized result, so that gitlab-shell can pass it to hooks
Diffstat (limited to 'lib/api/internal.rb')
| -rw-r--r-- | lib/api/internal.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index a0557a609ca..6e78ac2c903 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -31,6 +31,12 @@ module API protocol = params[:protocol] actor.update_last_used_at if actor.is_a?(Key) + user = + if actor.is_a?(Key) + actor.user + else + actor + end access_checker_klass = wiki? ? Gitlab::GitAccessWiki : Gitlab::GitAccess access_checker = access_checker_klass @@ -47,6 +53,7 @@ module API { status: true, gl_repository: gl_repository, + gl_username: user&.username, repository_path: repository_path, gitaly: gitaly_payload(params[:action]) } |