kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Expose remove_source_branch boolean/null

This commit is contained in:
Oswaldo Ferreira 2017-05-24 21:54:57 -03:00
parent 9b479f4305
commit 33923a49f8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/serializers/merge_request_entity.rb
View File

@ -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?

3
spec/fixtures/api/schemas/entities/merge_request.json vendored
View File

@ -92,7 +92,8 @@
"diverged_commits_count": { "type": "integer" },
"commit_change_content_path": { "type": "string" },
"remove_wip_path": { "type": "string" },
"commits_count": { "type": "integer" }
"commits_count": { "type": "integer" },
"remove_source_branch": { "type": ["boolean", "null"] }
},
"additionalProperties": false
}