diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2016-01-14 15:11:15 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2016-01-14 15:11:15 +0100 |
| commit | 01a407001d2b8400426f79db0762bb91e7b178f0 (patch) | |
| tree | bcef1fc672d55ebd871ed4d36807432295e7a861 | |
| parent | 56a45b0962b5ba61d69c2d2e8641664f37b3d686 (diff) | |
| download | gitlab-ce-ci/api-extend-commits.tar.gz | |
Move `status` field back directly to commit data in APIci/api-extend-commits
| -rw-r--r-- | doc/api/commits.md | 2 | ||||
| -rw-r--r-- | doc/api/merge_requests.md | 4 | ||||
| -rw-r--r-- | lib/api/entities.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/api/commits.md b/doc/api/commits.md index 4034187babe..74d1e03814f 100644 --- a/doc/api/commits.md +++ b/doc/api/commits.md @@ -73,8 +73,8 @@ curl -H "PRIVATE_TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3 "parent_ids": [ "ae1d9fb46aa2b07ee9836d49862ec4e2c46fbbba" ], + "status": "failed", "last_build": { - "status": "failed", "coverage": null, "duration": 2, "started_at": "2015-12-24T17:54:09.744Z", diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 89a9573740b..b2434b55baf 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -110,12 +110,12 @@ Parameters: ], "short_id": "6c14056d", "title": "Add some fixes", + "status": "running", "last_build": { "coverage": null, "duration": 0, "finished_at": null, - "started_at": "2012-04-25T13:15:15.000+01:00", - "status": "running" + "started_at": "2012-04-25T13:15:15.000+01:00" } } } diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 5ab82ebaa5f..f5776900b42 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -132,7 +132,6 @@ module API end class RepoCommitLastBuild < Grape::Entity - expose :status expose :started_at expose :finished_at expose :duration @@ -141,6 +140,7 @@ module API class RepoCommitDetail < RepoCommit expose :parent_ids, :committed_date, :authored_date + expose :status expose :ci_commit, as: :last_build, with: Entities::RepoCommitLastBuild end |