diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 12:51:30 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-01-24 12:51:30 +0000 |
| commit | 6c83592e614512aea485f89fa96e928c1da89704 (patch) | |
| tree | f2124c9a0109ea7fadcd29f353598fc1aeb6fbae /lib/api/entities.rb | |
| parent | ab04f05c135933837ced0a51037832f9be968eb7 (diff) | |
| parent | 63e5a314b4f149fad39d40f898e13f705340cc22 (diff) | |
| download | gitlab-ce-6c83592e614512aea485f89fa96e928c1da89704.tar.gz | |
Merge branch 'security-pipeline-trigger-tokens-exposure' into 'master'
[master] Do not expose trigger token when user should not see it
See merge request gitlab/gitlabhq!2735
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index e0a48908122..62278360329 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -1223,8 +1223,11 @@ module API end class Trigger < Grape::Entity + include ::API::Helpers::Presentable + expose :id - expose :token, :description + expose :token + expose :description expose :created_at, :updated_at, :last_used expose :owner, using: Entities::UserBasic end |