Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrei Dziahel <develop7@develop7.info>2016-01-17 21:59:43 +0300
committerRémy Coutable <remy@rymai.me>2016-02-08 19:04:58 +0300
commit86d15c1e9a824343d7698e81bd2eb4c6f2d7cc74 (patch)
tree85967243d9f5dd4bb572c302ae5c9c1f77a8962f /lib
parent9fdd605fd2e4550170e5ef088bec7c6d2585c4a5 (diff)
Expose MergeRequest::merge_status to API
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb1
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