diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-20 12:16:11 +0300 |
commit | edaa33dee2ff2f7ea3fac488d41558eb5f86d68c (patch) | |
tree | 11f143effbfeba52329fb7afbd05e6e2a3790241 /spec/fixtures/api | |
parent | d8a5691316400a0f7ec4f83832698f1988eb27c1 (diff) |
Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42
Diffstat (limited to 'spec/fixtures/api')
-rw-r--r-- | spec/fixtures/api/schemas/graphql/packages/package_details.json | 24 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/public_api/v4/merge_request.json | 12 |
2 files changed, 36 insertions, 0 deletions
diff --git a/spec/fixtures/api/schemas/graphql/packages/package_details.json b/spec/fixtures/api/schemas/graphql/packages/package_details.json index 9ef7f6c9271..50e52a7bb87 100644 --- a/spec/fixtures/api/schemas/graphql/packages/package_details.json +++ b/spec/fixtures/api/schemas/graphql/packages/package_details.json @@ -149,6 +149,30 @@ } } } + }, + "npmUrl": { + "type": "string" + }, + "mavenUrl": { + "type": "string" + }, + "conanUrl": { + "type": "string" + }, + "nugetUrl": { + "type": "string" + }, + "pypiUrl": { + "type": "string" + }, + "pypiSetupUrl": { + "type": "string" + }, + "composerUrl": { + "type": "string" + }, + "composerConfigRepositoryUrl": { + "type": "string" } } } diff --git a/spec/fixtures/api/schemas/public_api/v4/merge_request.json b/spec/fixtures/api/schemas/public_api/v4/merge_request.json index c31e91cfef8..a55c4b8974b 100644 --- a/spec/fixtures/api/schemas/public_api/v4/merge_request.json +++ b/spec/fixtures/api/schemas/public_api/v4/merge_request.json @@ -20,6 +20,18 @@ }, "additionalProperties": false }, + "merge_user": { + "type": ["object", "null"], + "properties": { + "name": { "type": "string" }, + "username": { "type": "string" }, + "id": { "type": "integer" }, + "state": { "type": "string" }, + "avatar_url": { "type": "uri" }, + "web_url": { "type": "uri" } + }, + "additionalProperties": false + }, "merged_at": { "type": ["string", "null"] }, "closed_by": { "type": ["object", "null"], |