diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-09-13 17:11:10 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-19 23:48:40 -0500 |
| commit | 7af585f1667935165701ec290e6ce37a436ad4c6 (patch) | |
| tree | 8905263cdf5e28c740176cb9dff827d33c38f5aa /app/serializers | |
| parent | dede5f01889e31ae7dd1e3b45f6b3852e7c0e18a (diff) | |
| download | gitlab-ce-7af585f1667935165701ec290e6ce37a436ad4c6.tar.gz | |
Fast forward merge: basic implemenation[ci skip]
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_entity.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb index 07650ce6f20..1f5ce2ef58c 100644 --- a/app/serializers/merge_request_entity.rb +++ b/app/serializers/merge_request_entity.rb @@ -13,6 +13,11 @@ class MergeRequestEntity < IssuableEntity expose :target_branch expose :target_project_id + expose :ff_only_enabled do |merge_request| + merge_request.project.merge_requests_ff_only_enabled + end + + # Events expose :merge_event, using: EventEntity expose :closed_event, using: EventEntity |