diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-07-16 12:11:25 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-07-16 12:11:25 +0200 |
| commit | 9b6f1c59484a0c0e4cee9a27cfa4dc9a89683848 (patch) | |
| tree | 5fb41de4808d118aa7e416fb73084e0fc30ee8ff | |
| parent | f502a83b052f4a99596971964908f5422884bfb0 (diff) | |
| parent | daed441dfe2bff0c64c581a802ee38a1ac42e6c6 (diff) | |
| download | gitlab-ce-9b6f1c59484a0c0e4cee9a27cfa4dc9a89683848.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | doc/api/merge_requests.md | 7 | ||||
| -rw-r--r-- | lib/api/entities.rb | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md index 7624fd3a3ef..bb551fc67f7 100644 --- a/doc/api/merge_requests.md +++ b/doc/api/merge_requests.md @@ -49,7 +49,8 @@ Parameters: "state": "active", "created_at": "2012-04-29T08:46:00Z" }, - "description":"fixed login page css paddings" + "description":"fixed login page css paddings", + "work_in_progress": false } ] ``` @@ -94,7 +95,8 @@ Parameters: "state": "active", "created_at": "2012-04-29T08:46:00Z" }, - "description":"fixed login page css paddings" + "description":"fixed login page css paddings", + "work_in_progress": false } ``` @@ -118,6 +120,7 @@ Parameters: "project_id": 4, "title": "Blanditiis beatae suscipit hic assumenda et molestias nisi asperiores repellat et.", "description": "Qui voluptatibus placeat ipsa alias quasi. Deleniti rem ut sint. Optio velit qui distinctio.", + "work_in_progress": false, "state": "reopened", "created_at": "2015-02-02T19:49:39.159Z", "updated_at": "2015-02-02T20:08:49.959Z", diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 31202fa8c1f..ecf1412dee5 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -171,6 +171,7 @@ module API expose :source_project_id, :target_project_id expose :label_names, as: :labels expose :description + expose :work_in_progress?, as: :work_in_progress expose :milestone, using: Entities::Milestone end |