diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-14 12:44:28 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-14 13:23:01 +0200 |
| commit | d10e3c4498e11e97548b0212887a146d19d19ffd (patch) | |
| tree | 40160307c143e1796e1dad5e55caf1b9d4a7cdfb /lib/api/entities.rb | |
| parent | 3a69dd20a1d8e54c25f871f35f09a1b8b5d4b2a4 (diff) | |
| parent | 82da19cecd6390d2372bad36da0a9f89b21abb38 (diff) | |
| download | gitlab-ce-d10e3c4498e11e97548b0212887a146d19d19ffd.tar.gz | |
Merge branch 'master' into filter-labelfilter-label
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 9620d36ac41..519072d0157 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -149,6 +149,7 @@ module API class RepoCommitDetail < RepoCommit expose :parent_ids, :committed_date, :authored_date + expose :status end class ProjectSnippet < Grape::Entity @@ -228,6 +229,12 @@ module API expose :created_at end + class CommitStatus < Grape::Entity + expose :id, :sha, :ref, :status, :name, :target_url, :description, + :created_at, :started_at, :finished_at + expose :author, using: Entities::UserBasic + end + class Event < Grape::Entity expose :title, :project_id, :action_name expose :target_id, :target_type, :author_id |