diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2017-05-25 12:46:04 -0400 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2017-05-25 12:46:04 -0400 |
| commit | 8b746c22f74cb8728f8a6201adf9c95dd95194bc (patch) | |
| tree | fbb9559ac3d2c41af0436098b515fad540ef9dd2 | |
| parent | 8d2a1591fb9ceeebe1d820b8e364f8b7b85f2987 (diff) | |
| parent | 33923a49f85cb814f87a495d63c09503f53466e4 (diff) | |
| download | gitlab-ce-8b746c22f74cb8728f8a6201adf9c95dd95194bc.tar.gz | |
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
| -rw-r--r-- | app/serializers/merge_request_entity.rb | 1 | ||||
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request.json | 3 |
2 files changed, 3 insertions, 1 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? diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request.json index 4afbb87453e..b6a59a6cc47 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request.json @@ -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 } |