summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-11-24 14:59:02 +0100
committerZeger-Jan van de Weg <mail@zjvandeweg.nl>2015-12-02 13:27:16 +0100
commita7682f8775a4609ac8c70151ffe8f3ccf3b767b6 (patch)
tree0a8cbe67be583b1e02daa1316b22b1b67ef018a8 /lib/api/entities.rb
parent8608c6325e19f529f7b43ff881c562d3a0114e1c (diff)
downloadgitlab-ce-a7682f8775a4609ac8c70151ffe8f3ccf3b767b6.tar.gz
Specs for 'Merge When Build Succeeds'
Diffstat (limited to 'lib/api/entities.rb')
-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 d6aec03d7f5..6f9f71b0945 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -169,6 +169,7 @@ module API
expose :description
expose :work_in_progress?, as: :work_in_progress
expose :milestone, using: Entities::Milestone
+ expose :merge_when_build_succeeds
end
class MergeRequestChanges < MergeRequest