diff options
author | Stan Hu <stanhu@gmail.com> | 2018-11-15 19:06:28 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-11-30 03:55:59 +0000 |
commit | 29478876ecb62e85c0d5ec228b5a393b86c5c6e5 (patch) | |
tree | fe528ee2c7f20855bebb36f85525ac0f52a8be5d /lib | |
parent | d7033930023fa1753517b84eec68de3a054ecf06 (diff) | |
download | gitlab-ce-29478876ecb62e85c0d5ec228b5a393b86c5c6e5.tar.gz |
Merge branch 'if-53347_fix_impersonation_tokens' into 'master'
Display impersonation token value only after creation
See merge request gitlab-org/gitlab-ce!22916
(cherry picked from commit 1d16530501b18528b1955251aa33a26b81f53161)
f3cd24a9 Display impersonation token value only after creation
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/entities.rb | 6 | ||||
-rw-r--r-- | lib/api/users.rb | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 61d57c643f0..5572e86985c 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1263,7 +1263,11 @@ module API expose :token end - class ImpersonationToken < PersonalAccessTokenWithToken + class ImpersonationToken < PersonalAccessToken + expose :impersonation + end + + class ImpersonationTokenWithToken < PersonalAccessTokenWithToken expose :impersonation end diff --git a/lib/api/users.rb b/lib/api/users.rb index 2a56506f3a5..b41fce76df0 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -531,7 +531,7 @@ module API desc 'Create a impersonation token. Available only for admins.' do detail 'This feature was introduced in GitLab 9.0' - success Entities::ImpersonationToken + success Entities::ImpersonationTokenWithToken end params do requires :name, type: String, desc: 'The name of the impersonation token' @@ -542,7 +542,7 @@ module API impersonation_token = finder.build(declared_params(include_missing: false)) if impersonation_token.save - present impersonation_token, with: Entities::ImpersonationToken + present impersonation_token, with: Entities::ImpersonationTokenWithToken else render_validation_error!(impersonation_token) end |