Add latest changes from gitlab-org/gitlab@master

7 files changed, 39 insertions, 39 deletions

diff --git a/spec/fixtures/whats_new/20201225_01_01.yml b/spec/fixtures/whats_new/20201225_01_01.yml
index 7bf58900cc7..45f989be01c 100644
--- a/spec/fixtures/whats_new/20201225_01_01.yml
+++ b/spec/fixtures/whats_new/20201225_01_01.yml
@@ -1,7 +1,7 @@
 ---
-- title: It's gonna be a bright
-  body: |
+- name: It's gonna be a bright
+  description: |
     ## It's gonna be a bright
   self-managed: true
   gitlab-com: false
-  packages: ["Premium", "Ultimate"]
+  available_in: ["Premium", "Ultimate"]
diff --git a/spec/fixtures/whats_new/20201225_01_02.yml b/spec/fixtures/whats_new/20201225_01_02.yml
index 90b5192897e..baea00f7b11 100644
--- a/spec/fixtures/whats_new/20201225_01_02.yml
+++ b/spec/fixtures/whats_new/20201225_01_02.yml
@@ -1,7 +1,7 @@
 ---
-- title: bright
-  body: |
+- name: bright
+  description: |
     ## bright
   self-managed: true
   gitlab-com: false
-  packages: ["Premium", "Ultimate"]
+  available_in: ["Premium", "Ultimate"]
diff --git a/spec/fixtures/whats_new/20201225_01_04.yml b/spec/fixtures/whats_new/20201225_01_04.yml
index 0dfd0d780c7..918592aecfe 100644
--- a/spec/fixtures/whats_new/20201225_01_04.yml
+++ b/spec/fixtures/whats_new/20201225_01_04.yml
@@ -1,19 +1,19 @@
 ---
-- title: View epics on a board
-  body: |
+- name: View epics on a board
+  description: |
     ## View epics on a board
   self-managed: true
   gitlab-com: false
-  packages: ["Free", "Premium", "Ultimate"]
-- title: View Jira issue details in GitLab
-  body: |
+  available_in: ["Free", "Premium", "Ultimate"]
+- name: View Jira issue details in GitLab
+  description: |
     ## View Jira issue details in GitLab
   self-managed: true
   gitlab-com: false
-  packages: ["Premium", "Ultimate"]
-- title: Integrate any IT alerting tool with GitLab
-  body: |
+  available_in: ["Premium", "Ultimate"]
+- name: Integrate any IT alerting tool with GitLab
+  description: |
     ## Integrate any IT alerting tool with GitLab
   self-managed: true
   gitlab-com: false
-  packages: ["Ultimate"]
\ No newline at end of file
+  available_in: ["Ultimate"]
diff --git a/spec/fixtures/whats_new/20201225_01_05.yml b/spec/fixtures/whats_new/20201225_01_05.yml
index d707502af54..a14adfeec13 100644
--- a/spec/fixtures/whats_new/20201225_01_05.yml
+++ b/spec/fixtures/whats_new/20201225_01_05.yml
@@ -1,14 +1,14 @@
 ---
-- title: bright and sunshinin' day
-  body: |
+- name: bright and sunshinin' day
+  description: |
     bright and sunshinin' [day](https://en.wikipedia.org/wiki/Day)
   self-managed: true
   gitlab-com: false
-  packages: ["Premium", "Ultimate"]
+  available_in: ["Premium", "Ultimate"]
   release: '01.05'
-- title: I think I can make it now the pain is gone
-  body: |
+- name: I think I can make it now the pain is gone
+  description: |
     ## I think I can make it now the pain is gone
   self-managed: false
   gitlab-com: true
-  packages: ["Premium", "Ultimate"]
+  available_in: ["Premium", "Ultimate"]
diff --git a/spec/fixtures/whats_new/blank.yml b/spec/fixtures/whats_new/blank.yml
index 4628cae2ecc..1475db0ea82 100644
--- a/spec/fixtures/whats_new/blank.yml
+++ b/spec/fixtures/whats_new/blank.yml
@@ -1,5 +1,5 @@
-- title:
-  body:
+- name:
+  description:
   stage:
   self-managed:
   gitlab-com:
diff --git a/spec/fixtures/whats_new/invalid.yml b/spec/fixtures/whats_new/invalid.yml
index a3342be0f24..b888aba9a16 100644
--- a/spec/fixtures/whats_new/invalid.yml
+++ b/spec/fixtures/whats_new/invalid.yml
@@ -1,20 +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.
+- name: Create and view requirements in GitLab
+  description: 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
+  available_in: [ALL]
+  documentation_link: 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.
+- name: Retrieve CI/CD secrets from HashiCorp Vault
+  description: 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: [Free]
-  url: https://docs.gitlab.com/ee/ci/examples/authenticating-with-hashicorp-vault/index.html
+  available_in: [Free]
+  documentation_link: 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
index ec465f47989..e46ff85cd9c 100644
--- a/spec/fixtures/whats_new/valid.yml
+++ b/spec/fixtures/whats_new/valid.yml
@@ -1,20 +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.
+- name: Create and view requirements in GitLab
+  description: 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
+  available_in: [Ultimate]
+  documentation_link: 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.
+- name: Retrieve CI/CD secrets from HashiCorp Vault
+  description: 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: [Free]
-  url: https://docs.gitlab.com/ee/ci/examples/authenticating-with-hashicorp-vault/index.html
+  available_in: [Free]
+  documentation_link: 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