Merge branch 'main' into scheduled-workflow-tests

Author: sarahs

.github/ISSUE_COMMENT_TEMPLATE/status.yml …/ISSUE_COMMENT_TEMPLATE/quick-status.yml.github/ISSUE_COMMENT_TEMPLATE/status.yml renamed to .github/ISSUE_COMMENT_TEMPLATE/quick-status.yml .github/ISSUE_COMMENT_TEMPLATE/status.yml renamed to .github/ISSUE_COMMENT_TEMPLATE/quick-status.yml

@@ -1,26 +1,25 @@
 ---
-name: Status Update
+name: A Brief status Update
 description: A brief status update.
 body:
   - type: dropdown
     attributes:
-      name: Status
+      label: Status
       options:
-        - name: "GREEN \U0001F34F (All good, smooth sailing)"
+        - label: "GREEN \U0001F34F (All good, smooth sailing)"
           value: 'Status: GREEN'
-        - name: "YELLOW \U0001F7E1 (On track, with hurdles to work through)"
+        - label: "YELLOW \U0001F7E1 (On track, with hurdles to work through)"
           value: 'Status: YELLOW'
-        - name: "RED \U0001F534 (BLOCKED)"
+        - label: "RED \U0001F534 (BLOCKED)"
           value: 'Status: RED'
-  - type: input
+  - type: textarea
     attributes:
-      name: Update Summary
+      label: Update Summary
       placeholder:
         Brief summary of the status and next steps. Any blockers should be
         called out specifically.
-      inputType: longText
   - type: input
     attributes:
-      name: 'Attribution'
+      label: 'Attribution'
       value: '_created with :heart: by typing_ `/status`'
-      inputType: text
+      format: text

.github/ISSUE_COMMENT_TEMPLATE/target-date.yml

@@ -4,7 +4,7 @@ intro: You can change the name of a branch in a repository.
 permissions: People with write permissions to a repository can rename a branch in the repository. People with admin permissions can rename the default branch.
 versions:
   free-pro-team: '*'
-  enterprise-server: '>=3.1'
+  enterprise-server: '>=3.2'
 topics:
   - repositories
 ---
@@ -13,7 +13,9 @@ topics:
 
 You can rename a branch in a repository on {% data variables.product.product_location %}. For more information about branches, see "[About branches](/github/collaborating-with-issues-and-pull-requests/about-branches)."
 
-If you rename a branch, {% data variables.product.prodname_dotcom %} will automatically redirect links on {% if currentVersion == "free-pro-team@latest" %}{% data variables.product.prodname_dotcom_the_website %}{% else %}{% data variables.product.product_location_enterprise %}{% endif %} that contain the old branch name to the equivalent link on the renamed branch. {% data variables.product.prodname_dotcom %} will also update branch protection policies, as well as the base branch for open pull requests and draft releases.
+When you rename a branch on {% data variables.product.product_location %}, any URLs that contain the old branch name are automatically redirected to the equivalent URL for the renamed branch. Branch protection policies are also updated, as well as the base branch for open pull requests (including those for forks) and draft releases. After the rename is complete, {% data variables.product.prodname_dotcom %} provides instructions on the repository's home page directing contributors to update their local Git environments.
+
+Although file URLs are automatically redirected, raw file URLs are not redirected. Also, {% data variables.product.prodname_dotcom %} does not perform any redirects if users perform a `git pull` for the previous branch name.
 
 ### Renaming a branch
 

content/github/administering-a-repository/renaming-a-branch.md

@@ -1,7 +1,7 @@
 date: '2021-04-01'
 sections:
   security_fixes:
-    - "**HIGH:** An improper access control vulnerability was identified in GitHub Enterprise Server that allowed access tokens generated via a GitHub App's [web authentication flow](https://docs.github.com/en/developers/apps/identifying-and-authorizing-users-for-github-apps#web-application-flow) to read private repository metadata without requiring appropriate permissions. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.0.4 and was fixed in 3.0.4, 2.22.10, and 2.21.18. This vulnerability was reported via the GitHub Bug Bounty program and has been assigned CVE-2021-22865."
+    - "**HIGH:** An improper access control vulnerability was identified in GitHub Enterprise Server that allowed access tokens generated from a GitHub App's [web authentication flow](https://docs.github.com/en/developers/apps/identifying-and-authorizing-users-for-github-apps#web-application-flow) to read private repository metadata via the REST API without having been granted the appropriate permissions. To exploit this vulnerability, an attacker would need to create a GitHub App on the instance and have a user authorize the application through the web authentication flow. The private repository metadata returned would be limited to repositories owned by the user the token identifies. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.0.4 and was fixed in versions 3.0.4, 2.22.10, 2.21.18. This vulnerability has been assigned CVE-2021-22865 and was reported via the [GitHub Bug Bounty Program](https://bounty.github.com)."
     - Packages have been updated to the latest security versions.
   bugs:
     - Services were not transitioning to new log files as part of log rotation, resulting in increased disk usage.

data/release-notes/2-21/18.yml

@@ -1,7 +1,7 @@
 date: '2021-04-01'
 sections:
   security_fixes:
-    - "**HIGH:** An improper access control vulnerability was identified in GitHub Enterprise Server that allowed access tokens generated via a GitHub App's [web authentication flow](https://docs.github.com/en/developers/apps/identifying-and-authorizing-users-for-github-apps#web-application-flow) to read private repository metadata without requiring appropriate permissions. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.0.4 and was fixed in 3.0.4, 2.22.10, and 2.21.18. This vulnerability was reported via the GitHub Bug Bounty program and has been assigned CVE-2021-22865."
+    - "**HIGH:** An improper access control vulnerability was identified in GitHub Enterprise Server that allowed access tokens generated from a GitHub App's [web authentication flow](https://docs.github.com/en/developers/apps/identifying-and-authorizing-users-for-github-apps#web-application-flow) to read private repository metadata via the REST API without having been granted the appropriate permissions. To exploit this vulnerability, an attacker would need to create a GitHub App on the instance and have a user authorize the application through the web authentication flow. The private repository metadata returned would be limited to repositories owned by the user the token identifies. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.0.4 and was fixed in versions 3.0.4, 2.22.10, 2.21.18. This vulnerability has been assigned CVE-2021-22865 and was reported via the [GitHub Bug Bounty Program](https://bounty.github.com)."
     - Packages have been updated to the latest security versions.
   bugs:
     - A timezone set on GitHub Enterprise 11.10.x or earlier was not being used by some services which were defaulting to UTC time.

data/release-notes/2-22/10.yml

@@ -2,7 +2,7 @@ date: '2021-04-01'
 intro: The minimum infrastructure requirements have increased for {% data variables.product.prodname_ghe_server %} 3.0+. For more information, see "[About minimum requirements for GitHub Enterprise Server 3.0 and later](/admin/enterprise-management/upgrading-github-enterprise-server#about-minimum-requirements-for-github-enterprise-server-30-and-later)."
 sections:
   security_fixes:
-    - "**HIGH:** An improper access control vulnerability was identified in GitHub Enterprise Server that allowed access tokens generated via a GitHub App's [web authentication flow](https://docs.github.com/en/developers/apps/identifying-and-authorizing-users-for-github-apps#web-application-flow) to read private repository metadata without requiring appropriate permissions. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.0.4 and was fixed in 3.0.4, 2.22.10, and 2.21.18. This vulnerability was reported via the GitHub Bug Bounty program and has been assigned CVE-2021-22865."
+    - "**HIGH:** An improper access control vulnerability was identified in GitHub Enterprise Server that allowed access tokens generated from a GitHub App's [web authentication flow](https://docs.github.com/en/developers/apps/identifying-and-authorizing-users-for-github-apps#web-application-flow) to read private repository metadata via the REST API without having been granted the appropriate permissions. To exploit this vulnerability, an attacker would need to create a GitHub App on the instance and have a user authorize the application through the web authentication flow. The private repository metadata returned would be limited to repositories owned by the user the token identifies. This vulnerability affected all versions of GitHub Enterprise Server prior to 3.0.4 and was fixed in versions 3.0.4, 2.22.10, 2.21.18. This vulnerability has been assigned CVE-2021-22865 and was reported via the [GitHub Bug Bounty Program](https://bounty.github.com)."
     - Packages have been updated to the latest security versions.
   bugs:
     - When maintenance mode was enabled, some services continued to be listed as "active processes" even though they were expected to be running, and should not have been listed.
@@ -20,3 +20,5 @@ sections:
     - Git LFS tracked files [uploaded through the web interface](https://github.com/blog/2105-upload-files-to-your-repositories) are incorrectly added directly to the repository.
     - Issues cannot be closed if they contain a permalink to a blob in the same repository where the file path is longer than 255 characters.
     - When "Users can search GitHub.com" is enabled with GitHub Connect, issues in private and internal repositories are not included in GitHub.com search results.
+    - Jupyter Notebook rendering in the web UI may fail if the notebook includes non-ASCII UTF-8 characters.
+    - reStructuredText (RST) rendering in the web UI may fail and instead display raw RST markup text.