diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-30 10:34:15 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-30 10:34:15 +0100 |
| commit | 3465e1e52c812a4a4f4fe941ab04569ebf2a2c12 (patch) | |
| tree | 5e28219da36739e6c9abf7366105a6102dc47c5c /app/serializers | |
| parent | 5227ea5bc483359bb8a9a40057587651ecb850c2 (diff) | |
| parent | f47e86feaa91d4ba1b268c56dd0a488c7092b573 (diff) | |
| download | gitlab-ce-3465e1e52c812a4a4f4fe941ab04569ebf2a2c12.tar.gz | |
Merge branch 'master' into issue-edit-inline
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_entity.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb index b3247ae36dd..f7eb75395b5 100644 --- a/app/serializers/merge_request_entity.rb +++ b/app/serializers/merge_request_entity.rb @@ -39,6 +39,7 @@ class MergeRequestEntity < IssuableEntity expose :commits_count expose :cannot_be_merged?, as: :has_conflicts expose :can_be_merged?, as: :can_be_merged + expose :remove_source_branch?, as: :remove_source_branch expose :project_archived do |merge_request| merge_request.project.archived? |