diff options
author | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2018-01-19 15:07:40 +0300 |
commit | 418cb3714af8337cc7b727098dd5e5d56e387e54 (patch) | |
tree | 93c7184ea4111354c01f1fad513c2e4f41e35a62 /lib/api/v3/entities.rb | |
parent | 797ffb4a784d1183f2c6b9e67cec55fd3424dec8 (diff) | |
parent | 3541a259327061d10c04a5b287aca9349e0c7860 (diff) |
Merge branch '10-4-stable-prepare-rc8' into '10-4-stable'
Prepare 10.4 RC8 release
See merge request gitlab-org/gitlab-ce!16557
Diffstat (limited to 'lib/api/v3/entities.rb')
-rw-r--r-- | lib/api/v3/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/v3/entities.rb b/lib/api/v3/entities.rb index b74f12410de..2ccbb9da1c5 100644 --- a/lib/api/v3/entities.rb +++ b/lib/api/v3/entities.rb @@ -207,7 +207,7 @@ module API end class Trigger < Grape::Entity - expose :token, :created_at, :updated_at, :deleted_at, :last_used + expose :token, :created_at, :updated_at, :last_used expose :owner, using: ::API::Entities::UserBasic end |