Commit 8b746c22 authored by Bryce Johnson's avatar Bryce Johnson

Merge branch...

Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' of gitlab.com:gitlab-org/gitlab-ce into 32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project
parents 8d2a1591 33923a49
...@@ -39,6 +39,7 @@ class MergeRequestEntity < IssuableEntity ...@@ -39,6 +39,7 @@ class MergeRequestEntity < IssuableEntity
expose :commits_count expose :commits_count
expose :cannot_be_merged?, as: :has_conflicts expose :cannot_be_merged?, as: :has_conflicts
expose :can_be_merged?, as: :can_be_merged expose :can_be_merged?, as: :can_be_merged
expose :remove_source_branch?, as: :remove_source_branch
expose :project_archived do |merge_request| expose :project_archived do |merge_request|
merge_request.project.archived? merge_request.project.archived?
......
...@@ -92,7 +92,8 @@ ...@@ -92,7 +92,8 @@
"diverged_commits_count": { "type": "integer" }, "diverged_commits_count": { "type": "integer" },
"commit_change_content_path": { "type": "string" }, "commit_change_content_path": { "type": "string" },
"remove_wip_path": { "type": "string" }, "remove_wip_path": { "type": "string" },
"commits_count": { "type": "integer" } "commits_count": { "type": "integer" },
"remove_source_branch": { "type": ["boolean", "null"] }
}, },
"additionalProperties": false "additionalProperties": false
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment