diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-07-13 17:48:15 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-07-13 17:48:15 +0300 |
| commit | 6717643c30541a95eeb99202861c43eca7ffd9b4 (patch) | |
| tree | 87d86e5d76dd4a0f3d2e00ee9bf8aa17f052674e /spec/fixtures | |
| parent | 16b867d8ce6246ad849642d9f3a5cc505b312a5a (diff) | |
| parent | 9b9cbb4a1a046d4aa04af94373216fa8fdba79db (diff) | |
Merge branch 'ide-merge-requests-forks' into 'master'
Allow merge requests from forks to be opened in Web IDE
Closes #47460
See merge request gitlab-org/gitlab-ce!20521
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/api/schemas/entities/merge_request_widget.json | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/entities/merge_request_widget.json b/spec/fixtures/api/schemas/entities/merge_request_widget.json index 38ce92a5dc7..3b741d51598 100644 --- a/spec/fixtures/api/schemas/entities/merge_request_widget.json +++ b/spec/fixtures/api/schemas/entities/merge_request_widget.json @@ -29,8 +29,10 @@ "merge_when_pipeline_succeeds": { "type": "boolean" }, "source_branch": { "type": "string" }, "source_project_id": { "type": "integer" }, + "source_project_full_path": { "type": ["string", "null"]}, "target_branch": { "type": "string" }, "target_project_id": { "type": "integer" }, + "target_project_full_path": { "type": ["string", "null"]}, "allow_collaboration": { "type": "boolean"}, "metrics": { "oneOf": [ |