Move `status` field back directly to commit data in API

01a40700 · Tomasz Maczukin · 56a45b09 · 01a40700 · 01a40700 · 01a40700
--- 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",

--- 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"
    }
  }
 }

--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -132,7 +132,6 @@ class RepoCommit < Grape::Entity
    end

    class RepoCommitLastBuild < Grape::Entity
-      expose :status
      expose :started_at
      expose :finished_at
      expose :duration
@@ -141,6 +140,7 @@ class RepoCommitLastBuild < Grape::Entity

    class RepoCommitDetail < RepoCommit
      expose :parent_ids, :committed_date, :authored_date
+      expose :status
      expose :ci_commit, as: :last_build, with: Entities::RepoCommitLastBuild
    end