From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 20 Jan 2021 13:34:23 -0600 Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee --- spec/fixtures/api/schemas/entities/discussion.json | 1 + spec/fixtures/api/schemas/entities/member.json | 66 ++++++++++++++++ .../fixtures/api/schemas/entities/member_user.json | 22 ++++++ spec/fixtures/api/schemas/environment.json | 6 ++ .../graphql/namespace/package_settings.json | 12 +++ .../graphql/packages/package_composer_details.json | 12 +++ .../schemas/graphql/packages/package_details.json | 36 +++++++++ spec/fixtures/api/schemas/group_member.json | 89 ---------------------- spec/fixtures/api/schemas/group_members.json | 6 -- spec/fixtures/api/schemas/members.json | 6 ++ spec/fixtures/api/schemas/public_api/v4/notes.json | 1 + .../v4/snippet_repository_storage_move.json | 20 +++++ .../v4/snippet_repository_storage_moves.json | 6 ++ spec/fixtures/api/schemas/rollout_status.json | 52 +++++++++++++ spec/fixtures/emails/valid_note_on_issuable.eml | 24 ++++++ spec/fixtures/whats_new/blank.yml | 9 +++ spec/fixtures/whats_new/invalid.yml | 20 +++++ spec/fixtures/whats_new/valid.yml | 20 +++++ 18 files changed, 313 insertions(+), 95 deletions(-) create mode 100644 spec/fixtures/api/schemas/entities/member.json create mode 100644 spec/fixtures/api/schemas/entities/member_user.json create mode 100644 spec/fixtures/api/schemas/graphql/namespace/package_settings.json create mode 100644 spec/fixtures/api/schemas/graphql/packages/package_composer_details.json create mode 100644 spec/fixtures/api/schemas/graphql/packages/package_details.json delete mode 100644 spec/fixtures/api/schemas/group_member.json delete mode 100644 spec/fixtures/api/schemas/group_members.json create mode 100644 spec/fixtures/api/schemas/members.json create mode 100644 spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json create mode 100644 spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_moves.json create mode 100644 spec/fixtures/api/schemas/rollout_status.json create mode 100644 spec/fixtures/emails/valid_note_on_issuable.eml create mode 100644 spec/fixtures/whats_new/blank.yml create mode 100644 spec/fixtures/whats_new/invalid.yml create mode 100644 spec/fixtures/whats_new/valid.yml (limited to 'spec/fixtures') diff --git a/spec/fixtures/api/schemas/entities/discussion.json b/spec/fixtures/api/schemas/entities/discussion.json index 2afabcc9195..1a5b8150ed2 100644 --- a/spec/fixtures/api/schemas/entities/discussion.json +++ b/spec/fixtures/api/schemas/entities/discussion.json @@ -48,6 +48,7 @@ "resolved": { "type": "boolean" }, "resolvable": { "type": "boolean" }, "resolved_by": { "type": ["string", "null"] }, + "resolved_at": { "type": ["date", "null"] }, "note": { "type": "string" }, "note_html": { "type": "string" }, "current_user": { "type": "object" }, diff --git a/spec/fixtures/api/schemas/entities/member.json b/spec/fixtures/api/schemas/entities/member.json new file mode 100644 index 00000000000..e8b40745803 --- /dev/null +++ b/spec/fixtures/api/schemas/entities/member.json @@ -0,0 +1,66 @@ +{ + "type": "object", + "required": [ + "id", + "created_at", + "expires_at", + "access_level", + "requested_at", + "source", + "valid_roles", + "can_update", + "can_remove" + ], + "properties": { + "id": { "type": "integer" }, + "created_at": { "type": "date-time" }, + "expires_at": { "type": ["date-time", "null"] }, + "requested_at": { "type": ["date-time", "null"] }, + "can_update": { "type": "boolean" }, + "can_remove": { "type": "boolean" }, + "access_level": { + "type": "object", + "required": ["integer_value", "string_value"], + "properties": { + "integer_value": { "type": "integer" }, + "string_value": { "type": "string" } + }, + "additionalProperties": false + }, + "source": { + "type": "object", + "required": ["id", "full_name", "web_url"], + "properties": { + "id": { "type": "integer" }, + "full_name": { "type": "string" }, + "web_url": { "type": "string" } + }, + "additionalProperties": false + }, + "valid_roles": { "type": "object" }, + "created_by": { + "type": "object", + "required": ["name", "web_url"], + "properties": { + "name": { "type": "string" }, + "web_url": { "type": "string" } + }, + "additionalProperties": false + }, + "user": { + "allOf": [ + { "$ref": "member_user.json" } + ] + }, + "invite": { + "type": "object", + "required": ["email", "avatar_url", "can_resend"], + "properties": { + "email": { "type": "string" }, + "avatar_url": { "type": "string" }, + "can_resend": { "type": "boolean" } + }, + "additionalProperties": false + } + } +} diff --git a/spec/fixtures/api/schemas/entities/member_user.json b/spec/fixtures/api/schemas/entities/member_user.json new file mode 100644 index 00000000000..983cdb7b9d9 --- /dev/null +++ b/spec/fixtures/api/schemas/entities/member_user.json @@ -0,0 +1,22 @@ +{ + "type": "object", + "required": ["id", "name", "username", "avatar_url", "web_url", "blocked", "two_factor_enabled"], + "properties": { + "id": { "type": "integer" }, + "name": { "type": "string" }, + "username": { "type": "string" }, + "avatar_url": { "type": ["string", "null"] }, + "web_url": { "type": "string" }, + "blocked": { "type": "boolean" }, + "two_factor_enabled": { "type": "boolean" }, + "status": { + "type": "object", + "required": ["emoji"], + "properties": { + "emoji": { "type": "string" } + }, + "additionalProperties": false + } + }, + "additionalProperties": false +} diff --git a/spec/fixtures/api/schemas/environment.json b/spec/fixtures/api/schemas/environment.json index b8c4253056e..4f54a77e6b2 100644 --- a/spec/fixtures/api/schemas/environment.json +++ b/spec/fixtures/api/schemas/environment.json @@ -37,6 +37,12 @@ "has_opened_alert": { "type": "boolean" }, "cluster_type": { "type": "types/nullable_string.json" }, "terminal_path": { "type": "types/nullable_string.json" }, + "rollout_status": { + "oneOf": [ + { "type": "null" }, + { "$ref": "rollout_status.json" } + ] + }, "last_deployment": { "oneOf": [ { "type": "null" }, diff --git a/spec/fixtures/api/schemas/graphql/namespace/package_settings.json b/spec/fixtures/api/schemas/graphql/namespace/package_settings.json new file mode 100644 index 00000000000..c1286ee0944 --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/namespace/package_settings.json @@ -0,0 +1,12 @@ +{ + "type": "object", + "required": ["mavenDuplicatesAllowed", "mavenDuplicateExceptionRegex"], + "properties": { + "mavenDuplicatesAllowed": { + "type": "boolean" + }, + "mavenDuplicateExceptionRegex": { + "type": "string" + } + } +} diff --git a/spec/fixtures/api/schemas/graphql/packages/package_composer_details.json b/spec/fixtures/api/schemas/graphql/packages/package_composer_details.json new file mode 100644 index 00000000000..bcf64a6e567 --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/packages/package_composer_details.json @@ -0,0 +1,12 @@ +{ + "type": "object", + "allOf": [{ "$ref": "./package_details.json" }], + "properties": { + "target_sha": { + "type": "string" + }, + "composer_json": { + "type": "object" + } + } +} diff --git a/spec/fixtures/api/schemas/graphql/packages/package_details.json b/spec/fixtures/api/schemas/graphql/packages/package_details.json new file mode 100644 index 00000000000..4f90285183c --- /dev/null +++ b/spec/fixtures/api/schemas/graphql/packages/package_details.json @@ -0,0 +1,36 @@ +{ + "type": "object", + "properties": { + "id": { + "type": "string" + }, + "name": { + "type": "string" + }, + "createdAt": { + "type": "string" + }, + "updatedAt": { + "type": "string" + }, + "version": { + "type": ["string", "null"] + }, + "package_type": { + "type": ["string"], + "enum": ["MAVEN", "NPM", "CONAN", "NUGET", "PYPI", "COMPOSER", "GENERIC", "GOLANG", "DEBIAN"] + }, + "tags": { + "type": "object" + }, + "project": { + "type": "object" + }, + "pipelines": { + "type": "object" + }, + "versions": { + "type": "object" + } + } +} diff --git a/spec/fixtures/api/schemas/group_member.json b/spec/fixtures/api/schemas/group_member.json deleted file mode 100644 index 3425108e46e..00000000000 --- a/spec/fixtures/api/schemas/group_member.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "type": "object", - "required": [ - "id", - "created_at", - "expires_at", - "access_level", - "requested_at", - "source", - "valid_roles", - "can_update", - "can_remove" - ], - "properties": { - "id": { "type": "integer" }, - "created_at": { "type": "date-time" }, - "expires_at": { "type": ["date-time", "null"] }, - "requested_at": { "type": ["date-time", "null"] }, - "can_update": { "type": "boolean" }, - "can_remove": { "type": "boolean" }, - "access_level": { - "type": "object", - "required": ["integer_value", "string_value"], - "properties": { - "integer_value": { "type": "integer" }, - "string_value": { "type": "string" } - } - }, - "source": { - "type": "object", - "required": ["id", "name", "web_url"], - "properties": { - "id": { "type": "integer" }, - "name": { "type": "string" }, - "web_url": { "type": "string" } - } - }, - "valid_roles": { "type": "object" }, - "created_by": { - "type": "object", - "required": ["name", "web_url"], - "properties": { - "name": { "type": "string" }, - "web_url": { "type": "string" } - } - }, - "user": { - "type": "object", - "required": [ - "id", - "name", - "username", - "avatar_url", - "web_url", - "blocked", - "two_factor_enabled" - ], - "properties": { - "id": { "type": "integer" }, - "name": { "type": "string" }, - "username": { "type": "string" }, - "avatar_url": { "type": ["string", "null"] }, - "web_url": { "type": "string" }, - "blocked": { "type": "boolean" }, - "two_factor_enabled": { "type": "boolean" }, - "status": { - "type": "object", - "required": [ - "emoji", - "message_html" - ], - "properties": { - "emoji": { "type": "string" }, - "message_html": { "type": "string" } - } - } - } - }, - "invite": { - "type": "object", - "required": ["email", "avatar_url", "can_resend"], - "properties": { - "email": { "type": "string" }, - "avatar_url": { "type": "string" }, - "can_resend": { "type": "boolean" } - } - } - } -} diff --git a/spec/fixtures/api/schemas/group_members.json b/spec/fixtures/api/schemas/group_members.json deleted file mode 100644 index 6268c7ef4d8..00000000000 --- a/spec/fixtures/api/schemas/group_members.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "array", - "items": { - "$ref": "group_member.json" - } -} diff --git a/spec/fixtures/api/schemas/members.json b/spec/fixtures/api/schemas/members.json new file mode 100644 index 00000000000..0b0b56da9f8 --- /dev/null +++ b/spec/fixtures/api/schemas/members.json @@ -0,0 +1,6 @@ +{ + "type": "array", + "items": { + "$ref": "entities/member.json" + } +} diff --git a/spec/fixtures/api/schemas/public_api/v4/notes.json b/spec/fixtures/api/schemas/public_api/v4/notes.json index 683dcb19836..c4510207882 100644 --- a/spec/fixtures/api/schemas/public_api/v4/notes.json +++ b/spec/fixtures/api/schemas/public_api/v4/notes.json @@ -31,6 +31,7 @@ "resolved": { "type": "boolean" }, "resolvable": { "type": "boolean" }, "resolved_by": { "type": ["string", "null"] }, + "resolved_at": { "type": ["date", "null"] }, "confidential": { "type": ["boolean", "null"] } }, "required": [ diff --git a/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json new file mode 100644 index 00000000000..f51e7e8edc5 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_move.json @@ -0,0 +1,20 @@ +{ + "type": "object", + "required": [ + "id", + "created_at", + "state", + "source_storage_name", + "destination_storage_name", + "snippet" + ], + "properties" : { + "id": { "type": "integer" }, + "created_at": { "type": "date" }, + "state": { "type": "string" }, + "source_storage_name": { "type": "string" }, + "destination_storage_name": { "type": "string" }, + "snippet": { "type": "object" } + }, + "additionalProperties": false +} diff --git a/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_moves.json b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_moves.json new file mode 100644 index 00000000000..292bb335539 --- /dev/null +++ b/spec/fixtures/api/schemas/public_api/v4/snippet_repository_storage_moves.json @@ -0,0 +1,6 @@ +{ + "type": "array", + "items": { + "$ref": "./snippet_repository_storage_move.json" + } +} diff --git a/spec/fixtures/api/schemas/rollout_status.json b/spec/fixtures/api/schemas/rollout_status.json new file mode 100644 index 00000000000..334bed4ab65 --- /dev/null +++ b/spec/fixtures/api/schemas/rollout_status.json @@ -0,0 +1,52 @@ +{ + "type": "object", + "additionalProperties": false, + "required": [ + "status" + ], + "properties": { + "status": { + "type": "string" + }, + "completion": { + "type": "integer" + }, + "is_completed": { + "type": "boolean" + }, + "has_legacy_app_label": { + "type": "boolean" + }, + "instances": { + "type": "array", + "items": { + "additionalProperties": false, + "type": "object", + "required": [ + "status", + "pod_name", + "tooltip", + "track", + "stable" + ], + "properties": { + "status": { + "type": "string" + }, + "pod_name": { + "type": "string" + }, + "tooltip": { + "type": "string" + }, + "track": { + "type": "string" + }, + "stable": { + "type": "boolean" + } + } + } + } + } +} diff --git a/spec/fixtures/emails/valid_note_on_issuable.eml b/spec/fixtures/emails/valid_note_on_issuable.eml new file mode 100644 index 00000000000..29308c9d969 --- /dev/null +++ b/spec/fixtures/emails/valid_note_on_issuable.eml @@ -0,0 +1,24 @@ +Return-Path: +Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400 +Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for ; Thu, 13 Jun 2013 17:03:50 -0400 +Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for ; Thu, 13 Jun 2013 14:03:48 -0700 +Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700 +Date: Thu, 13 Jun 2013 17:03:48 -0400 +From: Jake the Dog +To: incoming+gitlabhq-gitlabhq-project_id-auth_token-issue-issue_iid@appmail.adventuretime.ooo +Message-ID: +Subject: New Issue comment by email +Mime-Version: 1.0 +Content-Type: text/plain; + charset=ISO-8859-1 +Content-Transfer-Encoding: 7bit +X-Sieve: CMU Sieve 2.2 +X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu, + 13 Jun 2013 14:03:48 -0700 (PDT) +X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1 + +This should create a new comment on the issue. + +- Jake out + +> This quoted content will be included in the comment. diff --git a/spec/fixtures/whats_new/blank.yml b/spec/fixtures/whats_new/blank.yml new file mode 100644 index 00000000000..4628cae2ecc --- /dev/null +++ b/spec/fixtures/whats_new/blank.yml @@ -0,0 +1,9 @@ +- title: + body: + stage: + self-managed: + gitlab-com: + url: + image_url: + published_at: + release: diff --git a/spec/fixtures/whats_new/invalid.yml b/spec/fixtures/whats_new/invalid.yml new file mode 100644 index 00000000000..0e588efaf8f --- /dev/null +++ b/spec/fixtures/whats_new/invalid.yml @@ -0,0 +1,20 @@ +- title: Create and view requirements in GitLab + body: The first step towards managing requirements from within GitLab is here! This initial release allows users to create and view requirements at a project level. As Requirements Management evolves in GitLab, stay tuned for support for traceability between all artifacts, creating a seamless workflow to visually demonstrate completeness and compliance. + stage: Plan + self-managed: true + gitlab-com: true + packages: [ALL] + url: https://docs.gitlab.com/ee/user/project/requirements/index.html + image_url: https://about.gitlab.com/images/press/logo/png/gitlab-icon-rgb.png + published_at: 2020-04-22 + release: 12.10 +- title: Retrieve CI/CD secrets from HashiCorp Vault + body: In this release, GitLab adds support for lightweight JSON Web Token (JWT) authentication to integrate with your existing HashiCorp Vault. Now, you can seamlessly provide secrets to CI/CD jobs by taking advantage of HashiCorp's JWT authentication method rather than manually having to provide secrets as a variable in GitLab. + stage: Release + self-managed: true + gitlab-com: true + packages: [Starter] + url: https://docs.gitlab.com/ee/ci/examples/authenticating-with-hashicorp-vault/index.html + image_url: https://about.gitlab.com/images/12_10/jwt-vault-1.png + published_at: 2020-04-22 + release: 12.10 diff --git a/spec/fixtures/whats_new/valid.yml b/spec/fixtures/whats_new/valid.yml new file mode 100644 index 00000000000..cbe9d666357 --- /dev/null +++ b/spec/fixtures/whats_new/valid.yml @@ -0,0 +1,20 @@ +- title: Create and view requirements in GitLab + body: The first step towards managing requirements from within GitLab is here! This initial release allows users to create and view requirements at a project level. As Requirements Management evolves in GitLab, stay tuned for support for traceability between all artifacts, creating a seamless workflow to visually demonstrate completeness and compliance. + stage: Plan + self-managed: true + gitlab-com: true + packages: [Ultimate] + url: https://docs.gitlab.com/ee/user/project/requirements/index.html + image_url: https://about.gitlab.com/images/press/logo/png/gitlab-icon-rgb.png + published_at: 2020-04-22 + release: 12.10 +- title: Retrieve CI/CD secrets from HashiCorp Vault + body: In this release, GitLab adds support for lightweight JSON Web Token (JWT) authentication to integrate with your existing HashiCorp Vault. Now, you can seamlessly provide secrets to CI/CD jobs by taking advantage of HashiCorp's JWT authentication method rather than manually having to provide secrets as a variable in GitLab. + stage: Release + self-managed: true + gitlab-com: true + packages: [Starter] + url: https://docs.gitlab.com/ee/ci/examples/authenticating-with-hashicorp-vault/index.html + image_url: https://about.gitlab.com/images/12_10/jwt-vault-1.png + published_at: 2020-04-22 + release: 12.10 -- cgit v1.2.3