diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-11 16:06:01 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-11 16:06:01 +0000 |
| commit | 7acabf7c5908940665e1a8c4e3d09d423385657a (patch) | |
| tree | fad4bd291a00b986a3e79ad3c47f6ed5b870ed01 /lib/api/v3 | |
| parent | 0668f54b0a77f8dc6b7891ebd3755965bb6136ff (diff) | |
| parent | e5c49b57c35e5fe923b0fe29e1863cc29d6cf619 (diff) | |
| download | gitlab-ce-7acabf7c5908940665e1a8c4e3d09d423385657a.tar.gz | |
Merge branch 'remove-soft-removals' into 'master'
Remove soft removals related code
Closes #37447
See merge request gitlab-org/gitlab-ce!15789
Diffstat (limited to 'lib/api/v3')
| -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 c17b6f45ed8..64758dae7d3 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 |