diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-07 19:56:59 -0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-12-15 15:31:16 -0200 |
| commit | cba40a1f551e4c1b46bfa49a709f59feb59782bd (patch) | |
| tree | 85dd5352db35ba26b7dc060e3d514f43799152f1 /spec/fixtures/api/schemas | |
| parent | 73a79f7efbd8dec42b4a344faa3df5bf1c57a315 (diff) | |
| download | gitlab-ce-cba40a1f551e4c1b46bfa49a709f59feb59782bd.tar.gz | |
Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributes
requests
Diffstat (limited to 'spec/fixtures/api/schemas')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_widget.json (renamed from spec/fixtures/api/schemas/entities/merge_request.json) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json index ba094ba1657..342890c3dee 100644 --- a/spec/fixtures/api/schemas/entities/merge_request.json +++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -80,15 +80,15 @@ "target_branch_tree_path": { "type": "string" }, "source_branch_path": { "type": "string" }, "conflict_resolution_path": { "type": ["string", "null"] }, - "cancel_merge_when_pipeline_succeeds_path": { "type": "string" }, - "create_issue_to_resolve_discussions_path": { "type": "string" }, - "merge_path": { "type": "string" }, + "cancel_merge_when_pipeline_succeeds_path": { "type": ["string", "null"] }, + "create_issue_to_resolve_discussions_path": { "type": ["string", "null"] }, + "merge_path": { "type": ["string", "null"] }, "cherry_pick_in_fork_path": { "type": ["string", "null"] }, "revert_in_fork_path": { "type": ["string", "null"] }, "email_patches_path": { "type": "string" }, "plain_diff_path": { "type": "string" }, "status_path": { "type": "string" }, - "new_blob_path": { "type": "string" }, + "new_blob_path": { "type": ["string", "null"] }, "merge_check_path": { "type": "string" }, "ci_environments_status_path": { "type": "string" }, "merge_commit_message_with_description": { "type": "string" }, |