summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2019-01-24 16:51:14 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2019-01-24 16:51:14 +0000
commit5265942b751f41022393df2f52bc8e005d1ca168 (patch)
tree724aa6b7995a81cbbf189bae11a5f95f8af7f60e /lib/api/entities.rb
parent426716d1556f821988e67cc178e4ecffc4115897 (diff)
downloadgitlab-ce-11-4-stable.tar.gz
Revert "Merge branch 'security-pipeline-trigger-tokens-exposure-11-4' into 'security-11-4'"11-4-stable
This reverts commit 426716d1556f821988e67cc178e4ecffc4115897
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 9c2683702e7..fd36381aa51 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -1161,11 +1161,8 @@ module API
end
class Trigger < Grape::Entity
- include ::API::Helpers::Presentable
-
expose :id
- expose :token
- expose :description
+ expose :token, :description
expose :created_at, :updated_at, :last_used
expose :owner, using: Entities::UserBasic
end