diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-09 16:01:20 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-09 16:01:20 +0000 |
| commit | 6b0801d4f3bcdce5c7aaeb31227782293abbfa68 (patch) | |
| tree | 682d9c516915226d81022d8aedaa28d2f8a778f7 /lib | |
| parent | f86ff1b833eb04dfc66638bdff110fa7cb9b2360 (diff) | |
| parent | f6a666bdc2b9b557247c34935b69f35fb518e348 (diff) | |
| download | gitlab-ce-6b0801d4f3bcdce5c7aaeb31227782293abbfa68.tar.gz | |
Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master'
Expose MergeRequest#merge_status
_Originally opened at !2478 by @develop7._
- - -
This enables API users to see whether a merge request can be merged without conflicts.
See merge request !2756
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 82a75734de0..93e1c13c4c5 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -175,6 +175,7 @@ module API expose :work_in_progress?, as: :work_in_progress expose :milestone, using: Entities::Milestone expose :merge_when_build_succeeds + expose :merge_status end class MergeRequestChanges < MergeRequest |