diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-03-06 17:12:49 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-03-06 17:12:49 +0100 |
| commit | 0e5d065848aa3149efcb5248293f265699b5b57c (patch) | |
| tree | 8c9c725befc4847bf963f636a7210ac1fce3778a /lib/api/entities.rb | |
| parent | 46d99dedfbe10dc36c79c6f09d886ad2fc2192b5 (diff) | |
| parent | 348dff0a826c45f00f992e761423a22d2ac32bc3 (diff) | |
| download | gitlab-ce-23993-drop-ci_projects.tar.gz | |
Merge remote-tracking branch 'origin/master' into 23993-drop-ci_projects23993-drop-ci_projects
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index d2d21f5d03a..98ef9d4118e 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -592,10 +592,6 @@ module API end end - class TriggerRequest < Grape::Entity - expose :id, :variables - end - class Runner < Grape::Entity expose :id expose :description @@ -643,7 +639,10 @@ module API end class Trigger < Grape::Entity - expose :token, :created_at, :updated_at, :deleted_at, :last_used + expose :id + expose :token, :description + expose :created_at, :updated_at, :deleted_at, :last_used + expose :owner, using: Entities::UserBasic end class Variable < Grape::Entity |