Merge branch 'main' into sophie-7629

data/features/build-pages-with-actions.yml

@@ -0,0 +1,5 @@
+# Issue 7584
+# Building Pages sites with Actions [GA]
+versions:
+  fpt: '*'
+  ghec: '*'

data/features/create-branch-from-overview.yml

@@ -0,0 +1,5 @@
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>=3.7'
+  ghae: 'issue-6670'

data/graphql/ghes-3.5/schema.docs-enterprise.graphql

@@ -32385,6 +32385,12 @@ enum ReportedContentClassifiers {
 A repository contains the content for a project.
 """
 type Repository implements Node & PackageOwner & ProjectOwner & RepositoryInfo & Starrable & Subscribable & UniformResourceLocatable {
+  """
+  Whether or not a pull request head branch that is behind its base branch can
+  always be updated even if it is not required to be up to date before merging.
+  """
+  allowUpdateBranch: Boolean!
+
   """
   A list of users that can be assigned to issues in this repository.
   """

data/reusables/actions/jobs/multi-dimension-matrix.md

@@ -12,7 +12,7 @@ jobs:
   example_matrix:
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-22.04, ubuntu-20.04]
         version: [10, 12, 14]
     runs-on: {% raw %}${{ matrix.os }}{% endraw %}
     steps:

data/reusables/actions/supported-github-runners.md

@@ -36,7 +36,6 @@ Ubuntu 22.04
 <code>ubuntu-22.04</code>
 </td>
 <td>
-Ubuntu 22.04 is currently in public beta.
 </td>
 </tr>
 <tr>
@@ -49,12 +48,13 @@ Ubuntu 20.04
 </tr>
 <tr>
 <td>
-Ubuntu 18.04
+Ubuntu 18.04 <sup>[deprecated]</sup>
 </td>
 <td>
 <code>ubuntu-18.04</code>
 </td>
 <td>
+Migrate to <code>ubuntu-20.04</code> or <code>ubuntu-22.04</code>. For more information, see <A href="https://github.blog/changelog/2022-08-09-github-actions-the-ubuntu-18-04-actions-runner-image-is-being-deprecated-and-will-be-removed-by-12-1-22/">this GitHub blog post</A>.
 </td>
 </tr>
 <tr>
@@ -98,6 +98,6 @@ Migrate to <code>macOS-11</code> or <code>macOS-12</code>. For more information,
 
 {% warning %}
 
-<b>Note:</b> Beta and Deprecated Images are provided "as-is", "with all faults" and "as available" and are excluded from the service level agreement and warranty. Beta Images may not be covered by customer support. 
+<b>Note:</b> Beta and Deprecated Images are provided "as-is", "with all faults" and "as available" and are excluded from the service level agreement and warranty. Beta Images may not be covered by customer support.
 
 {% endwarning %}

data/reusables/gated-features/environments.md

@@ -1 +1 @@
-Environments, environment protection rules, and environment secrets are available in **public** repositories for all products. For access to environments in **private** repositories, you must use {% data variables.product.prodname_enterprise %}. {% data reusables.gated-features.more-info %}
+Environments, environment protection rules, and environment secrets are available in **public** repositories for all products. For access to environments in **private** or **internal** repositories, you must use {% data variables.product.prodname_pro %}, {% data variables.product.prodname_team %}, or {% data variables.product.prodname_enterprise %}. {% data reusables.gated-features.more-info %}

data/reusables/getting-started/math-and-diagrams.md

@@ -0,0 +1 @@
+{% ifversion mermaid %}You can use Markdown to add rendered math expressions, diagrams, maps, and 3D models to your wiki. For more information on creating rendered math expressions, see "[Writing mathematical expressions](/get-started/writing-on-github/working-with-advanced-formatting/writing-mathematical-expressions)." For more information on creating diagrams, maps and 3D models, see "[Creating diagrams](/get-started/writing-on-github/working-with-advanced-formatting/creating-diagrams)."{% endif %}

data/reusables/pages/check-workflow-run.md

@@ -1,8 +1,10 @@
-{% ifversion fpt %} 
-1. Unless your {% data variables.product.prodname_pages %} site is built from a private or internal repository and published from a branch, your site is built and deployed with a {% data variables.product.prodname_actions %} workflow. For more information about how to view the workflow status, see "[Viewing workflow run history](/actions/monitoring-and-troubleshooting-workflows/viewing-workflow-run-history)."
+{% ifversion build-pages-with-actions %}
+1. Your {% data variables.product.prodname_pages %} site is built and deployed with a {% data variables.product.prodname_actions %} workflow. For more information, see "[Viewing workflow run history](/actions/monitoring-and-troubleshooting-workflows/viewing-workflow-run-history)".
 
-{% note %}
+  {% note %}
 
-{% data reusables.pages.pages-builds-with-github-actions-public-beta %}
+  **Note:** {% data variables.product.prodname_actions %} is free for public repositories. Usage charges apply for private and internal repositories that go beyond the monthly allotment of free minutes. For more information, see "[Usage limits, billing, and administration](/actions/reference/usage-limits-billing-and-administration)".
 
-{% endnote %}{% endif %}
+  {% endnote %}
+
+{% endif %}

data/reusables/pages/pages-builds-with-github-actions-public-beta.md

@@ -1,5 +0,0 @@
-{% ifversion fpt %} 
-
-**Note:** {% data variables.product.prodname_actions %} workflow runs for your {% data variables.product.prodname_pages %} sites are in public beta for public repositories and subject to change. {% data variables.product.prodname_actions %} workflow runs are free for public repositories.
-
-{% endif %}

data/reusables/pages/wildcard-dns-warning.md

@@ -1,5 +1,5 @@
 {% warning %}
 
-**Warning:** We strongly recommend not using wildcard DNS records, such as `*.example.com`. A wildcard DNS record will allow anyone to host a {% data variables.product.prodname_pages %} site at one of your subdomains.
+**Warning:** We strongly recommend not using wildcard DNS records, such as `*.example.com`. A wildcard DNS record will allow anyone to host a {% data variables.product.prodname_pages %} site at one of your subdomains even when they are verified. For more information, see "[Verifying your custom domain for {% data variables.product.prodname_pages %}](/pages/configuring-a-custom-domain-for-your-github-pages-site/verifying-your-custom-domain-for-github-pages)."
 
 {% endwarning %}

data/reusables/saml/dotcom-saml-explanation.md

@@ -1 +1 @@
-SAML single sign-on (SSO) gives organization owners and enterprise owners using {% data variables.product.product_name %} a way to control and secure access to organization resources like repositories, issues, and pull requests.
+SAML single sign-on (SSO) gives organization owners and enterprise owners using {% data variables.product.product_name %} a way to control and secure access to organization resources like repositories, issues, and pull requests.

data/reusables/saml/outside-collaborators-exemption.md

@@ -1,5 +1,8 @@
 {% note %}
 
-**Note:** Outside collaborators aren't required to authenticate with an IdP to access the resources in an organization with SAML SSO. For more information on outside collaborators, see "[Roles in an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#outside-collaborators)."
+**Notes:** 
+
+- SAML authentication is not required for organization members to perform read operations such as viewing, cloning, and forking of public resources.
+- SAML authentication is not required for outside collaborators. For more information about outside collaborators, see "[Roles in an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#outside-collaborators)."
 
 {% endnote %}

data/reusables/saml/saml-accounts.md

@@ -1,7 +1,7 @@
-If you configure SAML SSO, members of your organization will continue to log into their personal accounts on {% data variables.product.prodname_dotcom_the_website %}. When a member accesses non-public resources within your organization that uses SAML SSO, {% data variables.product.prodname_dotcom %} redirects the member to your IdP to authenticate. After successful authentication, your IdP redirects the member back to {% data variables.product.prodname_dotcom %}, where the member can access your organization's resources.
+If you configure SAML SSO, members of your organization will continue to sign into their personal accounts on {% data variables.product.prodname_dotcom_the_website %}. When a member accesses non-public resources within your organization, {% data variables.product.prodname_dotcom %} redirects the member to your IdP to authenticate. After successful authentication, your IdP redirects the member back to {% data variables.product.prodname_dotcom %}. For more information, see "[About authentication with SAML single sign-on](/enterprise-cloud@latest/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on)."
 
 {% note %}
 
-**Note:** Organization members can perform read operations such as viewing, cloning, and forking on public resources owned by your organization even without a valid SAML session.
+**Note:** SAML SSO does not replace the normal sign-in process for {% data variables.product.prodname_dotcom %}. Unless you use {% data variables.product.prodname_emus %}, members will continue to sign into their personal accounts on {% data variables.product.prodname_dotcom_the_website %}, and each personal account will be linked to an external identity in your IdP.
 
-{% endnote %}
+{% endnote %}

data/reusables/secret-scanning/secret-list-private-push-protection.md

@@ -10,6 +10,8 @@ Atlassian | Bitbucket Server Personal Access Token | bitbucket_server_personal_a
 Azure | Azure Active Directory Application Secret | azure_active_directory_application_secret
 Azure | Azure Cache for Redis Access Key | azure_cache_for_redis_access_key
 Azure | Azure DevOps Personal Access Token | azure_devops_personal_access_token
+{%- ifversion fpt or ghec or ghes > 3.6 or ghae-issue-7456 %}
+Azure | Azure Storage Account Key | azure_storage_account_key{% endif %}
 Checkout.com | Checkout.com Production Secret Key | checkout_production_secret_key
 Clojars | Clojars Deploy Token | clojars_deploy_token
 Databricks | Databricks Access Token | databricks_access_token