Merge branch 'main' into nattywombat-redirect-pizza-1

Author: saritai

content/actions/deployment/security-hardening-your-deployments/using-openid-connect-with-reusable-workflows.md

@@ -7,7 +7,7 @@ redirect_from:
   - /actions/deployment/security-hardening-your-deployments/using-oidc-with-your-reusable-workflows
 versions:
   fpt: '*'
-  ghae: issue-4757-and-5856
+  ghae: issue-4757
   ghec: '*'
   ghes: '>=3.5'
 type: how_to

content/get-started/writing-on-github/working-with-advanced-formatting/organizing-information-with-collapsed-sections.md

@@ -6,8 +6,8 @@ versions:
   ghes: '*'
   ghae: '*'
   ghec: '*'
-  redirect_from:
-    - /github/writing-on-github/working-with-advanced-formatting/organizing-information-with-collapsed-sections
+redirect_from:
+  - /github/writing-on-github/working-with-advanced-formatting/organizing-information-with-collapsed-sections
 shortTitle: Collapsed sections
 ---
 ## Creating a collapsed section

content/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests.md

@@ -6,8 +6,8 @@ versions:
   ghes: '*'
   ghae: '*'
   ghec: '*'
-  redirect_from:
-    - /github/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests
+redirect_from:
+  - /github/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests
 topics:
   - Issues
   - Pull requests

data/features/README.md

@@ -45,7 +45,7 @@ versions:
 
 ## Schema enforcement
 
-The schema for validating the feature versioning lives in [`tests/helpers/schemas/feature-versions-schema.js`](/tests/helpers/schemas/feature-versions-schema.js) and is exercised by [`tests/linting/lint-files.js`](/tests/linting/lint-files.js).
+The schema for validating the feature versioning lives in [`tests/helpers/schemas/feature-versions-schema.js`](/tests/helpers/schemas/feature-versions-schema.js) and is exercised by [`tests/linting/lint-versioning.js`](/tests/linting/lint-versioning.js).
 
 ## Script to remove feature tags
 

data/graphql/ghae/schema.docs-ghae.graphql

@@ -11750,12 +11750,12 @@ The possible roles for enterprise membership.
 """
 enum EnterpriseUserAccountMembershipRole {
   """
-  The user is a member of the enterprise membership.
+  The user is a member of an organization in the enterprise.
   """
   MEMBER
 
   """
-  The user is an owner of the enterprise membership.
+  The user is an owner of an organization in the enterprise.
   """
   OWNER
 }
@@ -32816,6 +32816,11 @@ type Repository implements Node & ProjectOwner & RepositoryInfo & Starrable & Su
   """
   squashMergeAllowed: Boolean!
 
+  """
+  Whether a squash merge commit can use the pull request title as default.
+  """
+  squashPrTitleUsedAsDefault: Boolean!
+
   """
   The SSH URL to clone this repository
   """

data/graphql/ghec/schema.docs.graphql

@@ -8174,6 +8174,11 @@ enum DependencyGraphEcosystem {
   Ruby gems hosted at RubyGems.org
   """
   RUBYGEMS
+
+  """
+  Rust crates
+  """
+  RUST
 }
 
 """
@@ -12813,12 +12818,12 @@ The possible roles for enterprise membership.
 """
 enum EnterpriseUserAccountMembershipRole {
   """
-  The user is a member of the enterprise membership.
+  The user is a member of an organization in the enterprise.
   """
   MEMBER
 
   """
-  The user is an owner of the enterprise membership.
+  The user is an owner of an organization in the enterprise.
   """
   OWNER
 }
@@ -37285,6 +37290,11 @@ type Repository implements Node & PackageOwner & ProjectOwner & RepositoryInfo &
   """
   squashMergeAllowed: Boolean!
 
+  """
+  Whether a squash merge commit can use the pull request title as default.
+  """
+  squashPrTitleUsedAsDefault: Boolean!
+
   """
   The SSH URL to clone this repository
   """

data/graphql/schema.docs.graphql

@@ -8174,6 +8174,11 @@ enum DependencyGraphEcosystem {
   Ruby gems hosted at RubyGems.org
   """
   RUBYGEMS
+
+  """
+  Rust crates
+  """
+  RUST
 }
 
 """
@@ -12813,12 +12818,12 @@ The possible roles for enterprise membership.
 """
 enum EnterpriseUserAccountMembershipRole {
   """
-  The user is a member of the enterprise membership.
+  The user is a member of an organization in the enterprise.
   """
   MEMBER
 
   """
-  The user is an owner of the enterprise membership.
+  The user is an owner of an organization in the enterprise.
   """
   OWNER
 }
@@ -37285,6 +37290,11 @@ type Repository implements Node & PackageOwner & ProjectOwner & RepositoryInfo &
   """
   squashMergeAllowed: Boolean!
 
+  """
+  Whether a squash merge commit can use the pull request title as default.
+  """
+  squashPrTitleUsedAsDefault: Boolean!
+
   """
   The SSH URL to clone this repository
   """

lib/all-versions.js

@@ -16,6 +16,7 @@ const plans = [
     releases: [latestNonNumberedRelease],
     latestRelease: latestNonNumberedRelease,
     nonEnterpriseDefault: true, // permanent way to refer to this plan if the name changes
+    hasNumberedReleases: false,
     openApiBaseName: 'api.github.com', // used for REST
     miscBaseName: 'dotcom', // used for GraphQL and webhooks
   },
@@ -25,6 +26,7 @@ const plans = [
     shortName: 'ghec',
     releases: [latestNonNumberedRelease],
     latestRelease: latestNonNumberedRelease,
+    hasNumberedReleases: false,
     openApiBaseName: 'api.github.com',
     miscBaseName: 'ghec',
   },
@@ -44,8 +46,11 @@ const plans = [
     shortName: 'ghae',
     releases: [latestNonNumberedRelease],
     latestRelease: latestNonNumberedRelease,
+    hasNumberedReleases: false,
     openApiBaseName: 'github.ae',
     miscBaseName: 'ghae',
+    allowedFrontmatterPattern: '^issue-\\d+?$',
+    allowedInlinePattern: '^ghae-issue-\\d+?$',
   },
 ]
 

lib/frontmatter.js

@@ -14,13 +14,6 @@ const layoutNames = [
   'release-notes',
   false,
 ]
-const semverValidRange = semver.validRange
-const semverRange = {
-  type: 'string',
-  conform: semverValidRange,
-  message: 'Must be a valid SemVer range',
-}
-const versionObjs = Object.values(allVersions)
 
 const guideTypes = ['overview', 'quick_start', 'tutorial', 'how_to', 'reference']
 const featureVersions = fs
@@ -246,19 +239,44 @@ const featureVersionsProp = {
   },
 }
 
+const asteriskPattern = /^\*$/
+
 schema.properties.versions = {
   type: ['object', 'string'], // allow a '*' string to indicate all versions
   required: true,
-  properties: versionObjs.reduce((acc, versionObj) => {
-    acc[versionObj.plan] = semverRange
-    acc[versionObj.shortName] = semverRange
+  additionalProperties: false, // don't allow any versions in FM that aren't defined in lib/all-versions
+  properties: Object.values(allVersions).reduce((acc, versionObj) => {
+    acc[versionObj.plan] = getValidProps(versionObj)
+    acc[versionObj.shortName] = getValidProps(versionObj)
     return acc
   }, featureVersionsProp),
 }
 
-// Support 'github-ae': next
-schema.properties.versions.properties['github-ae'] = 'next'
-schema.properties.versions.properties.ghae = 'next'
+function getValidProps(versionObj) {
+  const valid = { type: 'string' }
+
+  // The properties attached to versionObj are defined in lib/all-versions.js.
+
+  // If a version has no numbered releases or exception pattern, the only valid value is '*'.
+  if (!(versionObj.hasNumberedReleases || versionObj.allowedFrontmatterPattern)) {
+    valid.pattern = asteriskPattern
+    valid.message = `Must have a value of '*'`
+  }
+
+  // If a version has an exception pattern, both '*' and the exception pattern are valid.
+  if (versionObj.allowedFrontmatterPattern) {
+    valid.pattern = new RegExp(`${asteriskPattern.source}|${versionObj.allowedFrontmatterPattern}`)
+    valid.message = `Must have a value of '*' or 'issue-###', where ### is an integer`
+  }
+
+  // If a version has numbered releases, any semver range is valid. Note '*' is a valid semver range.
+  if (versionObj.hasNumberedReleases) {
+    valid.conform = semver.validRange
+    valid.message = 'Must be a valid SemVer range'
+  }
+
+  return valid
+}
 
 function frontmatter(markdown, opts = {}) {
   const defaults = {

lib/graphql/static/changelog.json

@@ -1,4 +1,18 @@
 [
+  {
+    "schemaChanges": [
+      {
+        "title": "The GraphQL schema includes these changes:",
+        "changes": [
+          "Enum value `RUST` was added to enum `DependencyGraphEcosystem`",
+          "Field `squashPrTitleUsedAsDefault` was added to object type `Repository`"
+        ]
+      }
+    ],
+    "previewChanges": [],
+    "upcomingChanges": [],
+    "date": "2022-06-10"
+  },
   {
     "schemaChanges": [
       {