Merge branch 'main' into patch-2

content/admin/identity-and-access-management/using-saml-for-enterprise-iam/saml-configuration-reference.md

@@ -80,7 +80,7 @@ The following SAML attributes are available for {% data variables.product.produc
 | `NameID` | Yes | A persistent user identifier. Any persistent name identifier format may be used. {% ifversion ghec %}If you use an enterprise with {% data variables.product.prodname_emus %}, {% endif %}{% data variables.product.product_name %} will normalize the `NameID` element to use as a username unless one of the alternative assertions is provided. For more information, see "[Username considerations for external authentication](/admin/identity-and-access-management/managing-iam-for-your-enterprise/username-considerations-for-external-authentication)." |
 | `SessionNotOnOrAfter` | No | The date that {% data variables.product.product_name %} invalidates the associated session. After invalidation, the person must authenticate once again to access {% ifversion ghec or ghae %}your enterprise's resources{% elsif ghes %}{% data variables.product.product_location %}{% endif %}. For more information, see "[Session duration and timeout](#session-duration-and-timeout)." |
 {%- ifversion ghes or ghae %}
-| `administrator` | No | When the value is `true`, {% data variables.product.product_name %} will automatically promote the user to be a {% ifversion ghes %}site administrator{% elsif ghae %}enterprise owner{% endif %}. Any other value or a non-existent value will demote the account and remove administrative access. |
+| `administrator` | No | When the value is `true`, {% data variables.product.product_name %} will automatically promote the user to be a {% ifversion ghes %}site administrator{% elsif ghae %}enterprise owner{% endif %}. Setting this attribute to anything but `true` will result in demotion, as long as the value is not blank. Omitting this attribute or leaving the value blank will not change the role of the user. |
 | `username` | No | The username for {% data variables.product.product_location %}. |
 {%- endif %}
 | `full_name` | No | {% ifversion ghec %}If you configure SAML SSO for an enterprise and you use {% data variables.product.prodname_emus %}, the{% else %}The{% endif %} full name of the user to display on the user's profile page. |

content/developers/webhooks-and-events/webhooks/webhook-events-and-payloads.md

@@ -1337,6 +1337,34 @@ Key | Type | Description
 
 {% endif %}
 
+{% ifversion ghas-enablement-webhook %}
+
+## security_and_analysis
+
+Activity related to enabling or disabling code security and analysis features for a repository or organization.
+
+### Availability
+
+- Repository webhooks
+- Organization webhooks
+- {% data variables.product.prodname_github_apps %} with at least `read-only` access on repositories administration
+
+### Webhook payload object
+
+Key | Type | Description
+----|------|-------------
+`changes`|`object` | The changes that were made to the code security and analysis features.
+{% data reusables.webhooks.repo_desc %}
+{% data reusables.webhooks.org_desc %}
+{% data reusables.webhooks.app_desc %}
+{% data reusables.webhooks.sender_desc %}
+
+### Webhook payload example
+
+{{ webhookPayloadsForCurrentVersion.security_and_analysis }}
+
+{% endif %}
+
 {% ifversion fpt or ghec %}
 ## sponsorship
 

content/get-started/exploring-projects-on-github/saving-repositories-with-stars.md

@@ -41,6 +41,16 @@ Starring a repository is a simple two-step process.
 ![Untarring a repository](/assets/images/help/stars/unstarring-a-repository.png)
 
 {% ifversion fpt or ghec %}
+
+## Viewing who has starred a repository
+
+
+You can view everyone who has starred a public repository or a private repository you have access to. 
+
+
+To view everyone who has starred a repository, add `/stargazers` to the end of the URL of a repository. For example, to view stargazers for the github/docs repository, visit https://github.com/github/docs/stargazers.
+
+
 ## Organizing starred repositories with lists
 
 {% note %}

content/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-and-deleting-branches-within-your-repository.md

@@ -15,17 +15,37 @@ topics:
   - Pull requests
 shortTitle: Create & delete branches
 ---
+
 ## Creating a branch
+You can create a branch in different ways on {% data variables.product.product_name %}.
+
+{% note %}
 
+**Note:** You can only create a branch in a repository to which you have push access.
+
+{% endnote %}
+
+### Creating a branch via the branches overview
 {% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.navigate-to-branches %}
+1. Click **New branch**.
+   ![Screenshot of branches overview page with new branch button emphasized](/assets/images/help/branches/new-branch-button.png)
+2. In the dialog box, enter the branch name and optionally change the branch source. 
+3. Click **Create branch**.
+   ![Screenshot of branch creation modal with create branch button emphasized](/assets/images/help/branches/branch-creation-popup.png)
 
-1. Optionally, if you want to create your new branch from a branch other than the default branch for the repository, click {% octicon "git-branch" aria-label="The branch icon" %} **<em>NUMBER</em> branches** then choose another branch:
-    ![Branches link on overview page](/assets/images/help/branches/branches-link.png)
+### Creating a branch using the branch dropdown
+{% data reusables.repositories.navigate-to-repo %}
+1. Optionally, if you want to create the new branch from a branch other than the default branch of the repository, click {% octicon "git-branch" aria-label="The branch icon" %} **Branches** then choose another branch.
+    ![Branches link on overview page](/assets/images/help/branches/branches-overview-link.png)
 1. Click the branch selector menu.
     ![branch selector menu](/assets/images/help/branch/branch-selection-dropdown.png)
 1. Type a unique name for your new branch, then select **Create branch**.
     ![branch creation text box](/assets/images/help/branch/branch-creation-text-box.png)
-
+{% ifversion fpt or ghec or ghes > 3.4 %}
+### Creating a branch for an issue
+You can create a branch to work on an issue directly from the issue page and get started right away. For more information, see "[Creating a branch to work on an issue](/issues/tracking-your-work-with-issues/creating-a-branch-for-an-issue)".
+{% endif %}
 ## Deleting a branch
 
 {% data reusables.pull_requests.automatically-delete-branches %}

content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/filtering-files-in-a-pull-request.md

@@ -40,16 +40,16 @@ You can filter files in a pull request by file extension type, such as `.html` o
 {% data reusables.repositories.sidebar-pr %}
 1. In the list of pull requests, click the pull request you'd like to filter.
 {% data reusables.repositories.changed-files %}
-1. If the file tree is hidden, click **Show file tree** to display the file tree.
+
+1. Click on a file in the file tree to view the corresponding file diff. If the file tree is hidden, click {% octicon "sidebar-collapse" aria-label="The sidebar collapse icon" %} to display the file tree.
 
    {% note %}
 
    **Note**: The file tree will not display if your screen width is too narrow or if the pull request only includes one file.
 
    {% endnote %}
-
-1. Click on a file in the file tree to view the corresponding file diff.
-   ![Pull request file tree](/assets/images/help/pull_requests/pr-file-tree.png)
+
+   ![Screenshot of filter changed files search box and file tree emphasized](/assets/images/help/repository/file-tree.png)
 1. To filter by file path, enter part or all of the file path in the **Filter changed files** search box. Alternatively, use the file filter dropdown. For more information, see "[Using the file filter dropdown](#using-the-file-filter-dropdown)."
 
 {% endif %}

content/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork.md

@@ -77,14 +77,8 @@ Before you can sync your fork with an upstream repository, you must [configure a
   >  2 files changed, 7 insertions(+), 9 deletions(-)
   >  delete mode 100644 README
   >  create mode 100644 README.md
-  ``` If your local branch didn't have any unique commits, Git will instead perform a "fast-forward":
-  ```shell
-  $ git merge upstream/main
-  > Updating 34e91da..16c56ad
-  > Fast-forward
-  >  README.md                 |    5 +++--
-  >  1 file changed, 3 insertions(+), 2 deletions(-)
-  ```
+  ``` 
+
 
 {% tip %}
 

content/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/about-commits.md

@@ -41,5 +41,28 @@ Once the commit is on the default branch, any tags that contain the commit will
 
 ![Screenshot of commit with commit tag emphasized](/assets/images/help/commits/commit-tag-label.png)
 
+{% ifversion commit-tree-view %}
+
+## Using the file tree
+
+You can use the file tree to navigate between files in a commit.
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.navigate-to-commit-page %}
+1. Navigate to the commit by clicking the commit message link.
+   ![Screenshot of commit with commit message link emphasized](/assets/images/help/commits/commit-message-link.png)
+1. Click on a file in the file tree to view the corresponding file diff. If the file tree is hidden, click {% octicon "sidebar-collapse" aria-label="The sidebar collapse icon" %} to display the file tree.
+
+  {% note %}
+
+  **Note**: The file tree will not display if your screen width is too narrow or if the commit only includes one file.
+
+  {% endnote %}
+
+  ![Screenshot of filter changed files search box and file tree emphasized](/assets/images/help/repository/file-tree.png)
+1. To filter by file path, enter part or all of the file path in the **Filter changed files** search box.
+
+{% endif %}
+
 ## Further reading
 - "[Committing and reviewing changes to your project](/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project#about-commits)" on {% data variables.product.prodname_desktop %}

data/features/commit-tree-view.yml

@@ -0,0 +1,7 @@
+# Issue 6662
+# Commit file tree view
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>=3.6'
+  ghae: 'issue-6662'

data/features/ghas-enablement-webhook.yml

@@ -0,0 +1,6 @@
+# docs-content 7314. GHAS enablement webhook
+versions:
+  fpt: '*'
+  ghec: '*'
+  ghes: '>3.6'
+  ghae: 'issue-7314'

data/graphql/ghec/graphql_upcoming_changes.public.yml

@@ -96,6 +96,14 @@ upcoming_changes:
     date: '2022-07-01T00:00:00+00:00'
     criticality: breaking
     owner: cheshire137
+  - location: DependencyGraphDependency.packageLabel
+    description:
+      '`packageLabel` will be removed. Use normalized `packageName` field
+      instead.'
+    reason: '`packageLabel` will be removed.'
+    date: '2022-10-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/dependency_graph
   - location: RemovePullRequestFromMergeQueueInput.branch
     description: '`branch` will be removed.'
     reason:

data/graphql/ghec/schema.docs.graphql

@@ -8067,6 +8067,9 @@ type DependencyGraphDependency @preview(toggledBy: "hawkgirl-preview") {
   The original name of the package, as it appears in the manifest.
   """
   packageLabel: String!
+    @deprecated(
+      reason: "`packageLabel` will be removed. Use normalized `packageName` field instead. Removal on 2022-10-01 UTC."
+    )
 
   """
   The dependency package manager

data/graphql/graphql_upcoming_changes.public.yml

@@ -96,6 +96,14 @@ upcoming_changes:
     date: '2022-07-01T00:00:00+00:00'
     criticality: breaking
     owner: cheshire137
+  - location: DependencyGraphDependency.packageLabel
+    description:
+      '`packageLabel` will be removed. Use normalized `packageName` field
+      instead.'
+    reason: '`packageLabel` will be removed.'
+    date: '2022-10-01T00:00:00+00:00'
+    criticality: breaking
+    owner: github/dependency_graph
   - location: RemovePullRequestFromMergeQueueInput.branch
     description: '`branch` will be removed.'
     reason:

data/graphql/schema.docs.graphql

@@ -8067,6 +8067,9 @@ type DependencyGraphDependency @preview(toggledBy: "hawkgirl-preview") {
   The original name of the package, as it appears in the manifest.
   """
   packageLabel: String!
+    @deprecated(
+      reason: "`packageLabel` will be removed. Use normalized `packageName` field instead. Removal on 2022-10-01 UTC."
+    )
 
   """
   The dependency package manager

data/release-notes/enterprise-server/3-1/22.yml

@@ -0,0 +1,20 @@
+date: '2022-06-09'
+sections:
+  security_fixes:
+    - Packages have been updated to the latest security versions. 
+  bugs:
+    - An internal script to validate hostnames in the {% data variables.product.prodname_ghe_server %} configuration file would return an error if the hostname string started with a "." (period character). 
+    - In HA configurations where the primary node's hostname was longer than 60 characters, MySQL would fail to be configured.
+    - The calculation of "maximum committers across entire instance" reported in the site admin dashboard was incorrect.
+    - An incorrect database entry for repository replicas caused database corruption when performing a restore using {% data variables.product.prodname_enterprise_backup_utilities %}.
+  changes:
+    - In HA configurations where Elasticsearch reported a valid yellow status, changes introduced in a previous fix would block the `ghe-repl-stop` command and not allow replication to be stopped. Using `ghe-repo-stop --force` will now force Elasticsearch to stop when the service is in a normal or valid yellow status.
+  known_issues:
+    - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+    - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
+    - Custom firewall rules are removed during the upgrade process.
+    - 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 blob's file path is longer than 255 characters.
+    - When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in {% data variables.product.prodname_dotcom_the_website %} search results.
+    - If {% data variables.product.prodname_actions %} is enabled for {% data variables.product.prodname_ghe_server %}, teardown of a replica node with `ghe-repl-teardown` will succeed, but may return `ERROR:Running migrations`.
+    - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.

data/release-notes/enterprise-server/3-2/14.yml

@@ -0,0 +1,22 @@
+date: '2022-06-09'
+sections:
+  security_fixes:
+    - Packages have been updated to the latest security versions. 
+  bugs:
+    - An internal script to validate hostnames in the {% data variables.product.prodname_ghe_server %} configuration file would return an error if the hostname string started with a "." (period character). 
+    - In HA configurations where the primary node's hostname was longer than 60 characters, MySQL would fail to be configured.
+    - The `--gateway` argument was added to the `ghe-setup-network` command, to allow passing the gateway address when configuring network settings using the command line.
+    - Image attachments that were deleted would return a `500 Internal Server Error` instead of a `404 Not Found` error.
+    - The calculation of "maximum committers across entire instance" reported in the site admin dashboard was incorrect.
+    - An incorrect database entry for repository replicas caused database corruption when performing a restore using {% data variables.product.prodname_enterprise_backup_utilities %}.
+  changes:
+    - Optimised the inclusion of metrics when generating a cluster support bundle. 
+    - In HA configurations where Elasticsearch reported a valid yellow status, changes introduced in a previous fix would block the `ghe-repl-stop` command and not allow replication to be stopped. Using `ghe-repo-stop --force` will now force Elasticsearch to stop when the service is in a normal or valid yellow status.
+  known_issues:
+    - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
+    - Custom firewall rules are removed during the upgrade process.
+    - 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 blob's file path is longer than 255 characters.
+    - When "Users can search GitHub.com" is enabled with {% data variables.product.prodname_github_connect %}, issues in private and internal repositories are not included in {% data variables.product.prodname_dotcom_the_website %} search results.
+    - The {% data variables.product.prodname_registry %} npm registry no longer returns a time value in metadata responses. This was done to allow for substantial performance improvements. We continue to have all the data necessary to return a time value as part of the metadata response and will resume returning this value in the future once we have solved the existing performance issues.
+    - Resource limits that are specific to processing pre-receive hooks may cause some pre-receive hooks to fail.