1
0
mirror of synced 2025-12-23 03:44:00 -05:00

Remove 3.6 markup (#46930)

This commit is contained in:
Rachael Sewell
2023-11-30 10:10:09 -08:00
committed by GitHub
parent 2e97ed3aac
commit 24aaf8cca4
42 changed files with 48 additions and 95 deletions

View File

@@ -305,10 +305,10 @@ ghe-saml-mapping-csv -d
{% ifversion ghes < 3.9 %}
After output completes, the utility displays the path to the file. The default path for output depends on the patch release of {% data variables.product.product_name %} {% ifversion ghes = 3.6 %}3.6{% elsif ghes = 3.7%}3.7{% endif %} your instance is running.
After output completes, the utility displays the path to the file. The default path for output depends on the patch release of {% data variables.product.product_name %} {% ifversion ghes = 3.7%}3.7{% endif %} your instance is running.
- In version 3.{% ifversion ghes = 3.6 %}6.10{% elsif ghes = 3.7%}7.7{% elsif ghes = 3.8 %}8.0{% endif %}{% ifversion ghes < 3.8 %} and earlier{% endif %}, the utility writes the file to `/tmp`.
- In version 3.{% ifversion ghes = 3.6 %}6.11{% elsif ghes = 3.7%}7.8{% elsif ghes = 3.8 %}8.1{% endif %} and later,
- In version 3.{% ifversion ghes = 3.7%}7.7{% elsif ghes = 3.8 %}8.0{% endif %}{% ifversion ghes < 3.8 %} and earlier{% endif %}, the utility writes the file to `/tmp`.
- In version 3.{% ifversion ghes = 3.7%}7.8{% elsif ghes = 3.8 %}8.1{% endif %} and later,
{%- elsif ghes > 3.8 %}By default,{% endif %} the utility writes the file to `/data/user/tmp`.
@@ -1102,7 +1102,7 @@ git-import-rewrite
### ghe-find-insecure-git-operations
This utility searches your instance's logs and identifies Git operations over SSH that use insecure algorithms or hash functions, including DSA, RSA-SHA-1, HMAC-SHA-1, and CBC ciphers. You can use the output to support each client's transition to a more secure SSH connection. For more information, see [{% data variables.product.prodname_blog %}](https://github.blog/2022-06-28-improving-git-protocol-security-on-github-enterprise-server){% ifversion ghes > 3.5 %} and "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-ssh-connections-to-your-instance)."{% endif %}
This utility searches your instance's logs and identifies Git operations over SSH that use insecure algorithms or hash functions, including DSA, RSA-SHA-1, HMAC-SHA-1, and CBC ciphers. You can use the output to support each client's transition to a more secure SSH connection. For more information, see [{% data variables.product.prodname_blog %}](https://github.blog/2022-06-28-improving-git-protocol-security-on-github-enterprise-server) and "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/configuring-ssh-connections-to-your-instance)."
```shell
ghe-find-insecure-git-operations

View File

@@ -47,7 +47,7 @@ Your instance validates the hostnames for proxy exclusion using the list of IANA
1. Optionally, under **HTTP Proxy Exclusion**, type any hosts that do not require proxy access, separating hosts with commas. The following rules apply to top-level domains (TLDs) and IP addresses that you exclude from the proxy.
- When you exclude a TLD, you can exclude all hosts in a domain from requiring proxy access using `.` as a wildcard prefix, such as `.octo-org.tentacle`.
- {% ifversion ghes < 3.9 %}In {% data variables.product.product_name %} 3.{% ifversion ghes = 3.5 %}5.15{% elsif ghes = 3.6 %}6.11{% elsif ghes = 3.7%}7.8{% elsif ghes = 3.8 %}8.1{% endif %} and later, your{% else %}Your{% endif %} instance validates the hostnames you exclude using the list of IANA's registered TLDs. For more information, see the [list of TLDs](https://data.iana.org/TLD/tlds-alpha-by-domain.txt) on the IANA website. If you want to exclude an unregistered TLD, see "[Excluding additional unregistered TLDs from the proxy](#excluding-additional-unregistered-tlds-from-the-proxy)."
- {% ifversion ghes < 3.9 %}In {% data variables.product.product_name %} 3.{% ifversion ghes = 3.7%}7.8{% elsif ghes = 3.8 %}8.1{% endif %} and later, your{% else %}Your{% endif %} instance validates the hostnames you exclude using the list of IANA's registered TLDs. For more information, see the [list of TLDs](https://data.iana.org/TLD/tlds-alpha-by-domain.txt) on the IANA website. If you want to exclude an unregistered TLD, see "[Excluding additional unregistered TLDs from the proxy](#excluding-additional-unregistered-tlds-from-the-proxy)."
- You can exclude a full, valid IPv4 or IPv6 address.
- You cannot exclude an IPv4 or IPv6 address using a preceding or trailing dot as a wildcard.
@@ -55,7 +55,7 @@ Your instance validates the hostnames for proxy exclusion using the list of IANA
## Excluding additional unregistered TLDs from the proxy
{% ifversion ghes < 3.9 %}In {% data variables.product.product_name %} 3.{% ifversion ghes = 3.6 %}6.11{% elsif ghes = 3.7%}7.8{% elsif ghes = 3.8 %}8.1{% endif %} and later, you{% elsif ghes > 3.8 %}You{% endif %} can configure your instance's proxy settings to exclude unregistered TLDs that aren't specified in the [list of TLDs](https://data.iana.org/TLD/tlds-alpha-by-domain.txt) on the IANA website.
{% ifversion ghes < 3.9 %}In {% data variables.product.product_name %} 3.{% ifversion ghes = 3.7%}7.8{% elsif ghes = 3.8 %}8.1{% endif %} and later, you{% elsif ghes > 3.8 %}You{% endif %} can configure your instance's proxy settings to exclude unregistered TLDs that aren't specified in the [list of TLDs](https://data.iana.org/TLD/tlds-alpha-by-domain.txt) on the IANA website.
When you exclude additional unregistered TLDs, you must use `.` as a wildcard prefix. If the TLD is `tentacle`, you must exclude `.tentacle`. You cannot exclude an unregistered TLD without the preceding `.`.

View File

@@ -80,14 +80,6 @@ settings to allow incoming emails](#configuring-dns-and-firewall-settings-to-all
You can enforce TLS encryption for all incoming SMTP connections, which can help satisfy an ISO-27017 certification requirement.
{%- ifversion ghes = 3.6 %}
{% note %}
**Note**: Enforcement of TLS for SMTP connections is unavailable in {% data variables.product.product_name %} 3.6.0 and 3.6.1. The feature is available in 3.6.2 and later.
{% endnote %}
{%- endif %}
{% data reusables.enterprise_site_admin_settings.email-settings %}
1. Under "Authentication", select **Enforce TLS auth (recommended)**.

View File

@@ -27,7 +27,7 @@ To accommodate the SSH clients in your environment, you can configure the types
When users perform Git operations on {% data variables.location.product_location %} via SSH over port 22, the client can authenticate with an RSA key. The client may sign the attempt using the SHA-1 hash function. In this context, the SHA-1 hash function is no longer secure. For more information, see [SHA-1](https://en.wikipedia.org/wiki/SHA-1) on Wikipedia.
By default{% ifversion ghes < 3.7 %} on {% data variables.product.product_name %} 3.6 and later{% endif %}, SSH connections that satisfy **both** of the following conditions will fail.
By default, SSH connections that satisfy **both** of the following conditions will fail.
{% data reusables.ssh.rsa-sha-1-connection-failure-criteria %}

View File

@@ -43,9 +43,7 @@ When subdomain isolation is enabled, {% data variables.product.prodname_ghe_serv
{%- endif %}
| `http(s)://HOSTNAME/pages/` | `http(s)://pages.HOSTNAME/` |
| `http(s)://HOSTNAME/raw/` | `http(s)://raw.HOSTNAME/` |
{%- ifversion ghes < 3.7 %}
| `http(s)://HOSTNAME/render/` | `http(s)://render.HOSTNAME/` |
{%- endif %}
| `http(s)://HOSTNAME/reply/` | `http(s)://reply.HOSTNAME/` |
| `http(s)://HOSTNAME/uploads/` | `http(s)://uploads.HOSTNAME/` |
{%- ifversion viewscreen-and-notebooks %}

View File

@@ -53,7 +53,7 @@ If there is no existing account with a matching username on the instance, the us
{% ifversion scim-for-ghes %}
During SAML authentication, some environments may use a value other than `NameID` as the unique identifying claim. If your environment does not use `NameID` to identify users, a site administrator can configure custom user attributes for the instance. {% data variables.product.product_name %} will respect this mapping when SCIM is configured. {% ifversion ghes = 3.6 or ghes = 3.7 %} Custom mappings are supported in {% data variables.product.product_name %} 3.6.5 or 3.7.2 and later.{% endif %} For more information about mapping user attributes, see "[AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise#configuring-saml-sso)."
During SAML authentication, some environments may use a value other than `NameID` as the unique identifying claim. If your environment does not use `NameID` to identify users, a site administrator can configure custom user attributes for the instance. {% data variables.product.product_name %} will respect this mapping when SCIM is configured. {% ifversion ghes = 3.7 %} Custom mappings are supported in {% data variables.product.product_name %} 3.6.5 or 3.7.2 and later.{% endif %} For more information about mapping user attributes, see "[AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise#configuring-saml-sso)."
{% endif %}

View File

@@ -67,7 +67,7 @@ If the administrator you want to remove is a member of any organizations owned b
{% data reusables.enterprise-accounts.access-enterprise %}
{% data reusables.enterprise-accounts.people-tab %}
{% data reusables.enterprise-accounts.administrators-tab %}
{%- ifversion ghec or ghes > 3.6 %}
{%- ifversion ghec or ghes %}
1. Next to the username of the person you'd like to remove, select the {% octicon "kebab-horizontal" aria-label="Administrator settings" %} dropdown menu, then click **Convert to member**{% ifversion ghec %} or **Remove from enterprise**{% endif %}.
![Screenshot of a user in the enterprise administrators list. A dropdown menu, labeled with a kebab icon, is highlighted with an orange outline.](/assets/images/help/business-accounts/administrator-settings.png)
1. Read the confirmation, then click **Yes, convert USERNAME to member**{% ifversion ghec %} or **Yes, remove USERNAME**{% endif %}.

View File

@@ -39,7 +39,7 @@ For information about promoting a user to an organization owner, see the `ghe-or
{% data reusables.enterprise-accounts.people-tab %}
{% data reusables.enterprise-accounts.administrators-tab %}
1. In the upper-left corner of the page, in the "Find an administrator" search field, type the username of the person you want to demote.
{%- ifversion ghes > 3.6 %}
{%- ifversion ghes %}
1. In the search results, find the username of the person you want to demote, then select the {% octicon "kebab-horizontal" aria-label="Administrator settings" %} dropdown menu and click **Convert to member**.
![Screenshot of a user in the enterprise administrators list. A dropdown menu, labeled with a kebab icon, is highlighted with an orange outline.](/assets/images/help/business-accounts/administrator-settings.png)

View File

@@ -99,10 +99,6 @@ The following log files record events from the instance's HTTP server.
| <pre>/var/log/nginx/github.error.log</pre> | Records errors associated with HTTP requests. |
| <pre>/var/log/nginx/pages.log</pre> | Records HTTP requests associated with {% data variables.product.prodname_pages %}. For more information, see "[AUTOTITLE](/pages/getting-started-with-github-pages/about-github-pages)." |
| <pre>/var/log/nginx/pages.error.log</pre> | Records errors related to HTTP requests for {% data variables.product.prodname_pages %}. |
{%- ifversion ghes < 3.7 %}
| <pre>/var/log/nginx/render.log</pre> | Records HTTP requests associated with the `render` service, which renders content in the web UI such as GeoJSON, Jupyter notebooks, PDF, PSD, Solidworks, and SVG. |
| <pre>/var/log/nginx/render.error.log</pre> | Records errors associated with HTTP requests for the `render` service. |
{%- endif %}
### Log files for the {% data variables.enterprise.management_console %}
@@ -110,7 +106,7 @@ The following log files contain events from your instance's {% data variables.en
| Path | Description |
| :- | :- |
{%- ifversion ghes > 3.6 %}
{%- ifversion ghes %}
| <pre>/var/log/enterprise-manage/audit.log</pre> | Records activity in the instance's {% data variables.enterprise.management_console %}. |
{%- endif %}
| <pre>/var/log/enterprise-manage/unicorn.log</pre> | Records HTTP and HTTPS operations that administrators perform in the {% data variables.enterprise.management_console %} using the web UI or REST API. |

View File

@@ -2,7 +2,7 @@
title: Known issues with upgrades to your instance
intro: 'See an overview of workarounds for issues that impact the upgrade process for {% data variables.product.prodname_ghe_server %}, or impact your instance after you complete an upgrade.'
versions:
ghes: '>=3.7'
ghes: '*'
type: overview
topics:
- Enterprise

View File

@@ -281,7 +281,7 @@ To upgrade an instance that comprises multiple nodes using an upgrade package, y
{% endnote %}
{% ifversion ghes = 3.6 %}If you have upgraded each node to {% data variables.product.product_name %} 3.6.0 or later and started replication, but `git replication is behind the primary` continues to appear after 45 minutes, contact {% data variables.contact.enterprise_support %}.{% endif %} {% ifversion ghes = 3.6 %}Otherwise, if{% else %}If{% endif %} `ghe-repl-status` did not return `OK`, and the explanation isn't listed in the note above, contact {% data variables.contact.enterprise_support %}. For more information, see "[AUTOTITLE](/support/contacting-github-support)."
If `ghe-repl-status` did not return `OK`, and the explanation isn't listed in the note above, contact {% data variables.contact.enterprise_support %}. For more information, see "[AUTOTITLE](/support/contacting-github-support)."
{% data reusables.enterprise_installation.multiple-node-repeat-upgrade-process %}
1. After you have upgraded the last replica node and the resync is complete, disable maintenance mode so users can use {% data variables.location.product_location %}.

View File

@@ -287,7 +287,7 @@ If you have [enabled private mode](/admin/configuration/configuring-your-enterpr
Enabling anonymous Git read access allows users to bypass authentication for custom tools on your enterprise. When you or a repository administrator enable this access setting for a repository, unauthenticated Git operations (and anyone with network access to {% data variables.product.product_name %}) will have read access to the repository without authentication.
Anonymous Git read access is disabled by default.{% ifversion ghes = 3.6 or ghes = 3.7 %} When you upgrade to {% data variables.product.product_name %} 3.6 or later, anonymous Git read access is automatically disabled at the application level, and `git://` connections on port 9418 will return the following error.
Anonymous Git read access is disabled by default.{% ifversion ghes = 3.7 %} When you upgrade to {% data variables.product.product_name %} 3.6 or later, anonymous Git read access is automatically disabled at the application level, and `git://` connections on port 9418 will return the following error.
```text
The unauthenticated git protocol on port 9418 is no longer supported.

View File

@@ -34,8 +34,6 @@ For most individual users, GPG or SSH will be the best choice for signing commit
{% ifversion fpt or ghec %}
Commits and tags have the following verification statuses, depending on whether you have enabled vigilant mode. By default vigilant mode is not enabled. For information on how to enable vigilant mode, see "[AUTOTITLE](/authentication/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits)."
{% data reusables.identity-and-permissions.vigilant-mode-beta-note %}
Signing commits differs from signing off on a commit. For more information about signing off on commits, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-commit-signoff-policy-for-your-repository)."
### Default statuses

View File

@@ -14,8 +14,6 @@ redirect_from:
- /github/authenticating-to-github/managing-commit-signature-verification/displaying-verification-statuses-for-all-of-your-commits
---
{% data reusables.identity-and-permissions.vigilant-mode-beta-note %}
## About vigilant mode
When you work locally on your computer, Git allows you to set the author of your changes and the identity of the committer. This, potentially, makes it difficult for other people to be confident that commits and tags you create were actually created by you. To help solve this problem you can sign your commits and tags. For more information, see "[AUTOTITLE](/authentication/managing-commit-signature-verification/signing-commits)" and "[AUTOTITLE](/authentication/managing-commit-signature-verification/signing-tags)." {% data variables.product.prodname_dotcom %} marks signed commits and tags with a verification status.

View File

@@ -13,7 +13,7 @@ topics:
- Advanced Security
redirect_from:
- /code-security/secret-scanning/secret-scanning-partners
layout: inline # The supported secrets table expands with a11y options, this allows the page more room
layout: inline
---
{% data reusables.secret-scanning.beta %}
@@ -155,7 +155,7 @@ Push protection and validity checks are not supported for non-provider patterns.
{% endif %}
<!-- GHES 3.5 to GHES 3.8 table -->
{% ifversion ghes = 3.6 or ghes = 3.7 or ghes = 3.8 %}
{% ifversion ghes = 3.7 or ghes = 3.8 %}
| Provider | Token | {% data variables.product.prodname_secret_scanning_caps %} alert | Push protection |
|----|:----|:----:|:----:|

View File

@@ -45,7 +45,7 @@ Generally, we name our supported ecosystems after the software programming langu
- Composer (registry: https://packagist.org/){% ifversion GH-advisory-db-erlang-support %}
- Erlang (registry: https://hex.pm/){% endif %}
- Go (registry: https://pkg.go.dev/)
{%- ifversion fpt or ghec or ghes > 3.6 or ghae > 3.6 %}
{%- ifversion fpt or ghec or ghes or ghae > 3.6 %}
- GitHub Actions (https://github.com/marketplace?type=actions/) {% endif %}
- Maven (registry: https://repo.maven.apache.org/maven2)
- npm (registry: https://www.npmjs.com/)

View File

@@ -98,7 +98,7 @@ You can view data for security alerts across organizations in an enterprise. {%
{% data reusables.security-overview.alert-differences %}
{% ifversion ghes < 3.7 or ghae < 3.7 %}
{% ifversion ghae < 3.7 %}
## Viewing security overview for a team

View File

@@ -55,7 +55,7 @@ Any direct and indirect dependencies that are specified in the repository's mani
{% endif %}
{% ifversion dependency-graph-repository-view-update %}
Dependencies submitted to a project using the Dependency submission API (beta) will show which detector was used for their submission and when they were submitted.{% elsif ghes > 3.6 or ghae > 3.6 %}Dependencies submitted to a project using the Dependency submission API (beta), although also grouped by ecosystem, are shown separately from dependencies identified through manifest or lock files in the repository. These submitted dependencies appear in the dependency graph as "Snapshot dependencies" because they are submitted as a snapshot, or set, of dependencies.{% else %}{% endif %}{% ifversion dependency-submission-api %} For more information on using the dependency submission API, see "[AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api)."
Dependencies submitted to a project using the Dependency submission API (beta) will show which detector was used for their submission and when they were submitted.{% elsif ghes or ghae > 3.6 %}Dependencies submitted to a project using the Dependency submission API (beta), although also grouped by ecosystem, are shown separately from dependencies identified through manifest or lock files in the repository. These submitted dependencies appear in the dependency graph as "Snapshot dependencies" because they are submitted as a snapshot, or set, of dependencies.{% else %}{% endif %}{% ifversion dependency-submission-api %} For more information on using the dependency submission API, see "[AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api)."
{% endif %}
If vulnerabilities have been detected in the repository, these are shown at the top of the view for users with access to {% data variables.product.prodname_dependabot_alerts %}.

View File

@@ -48,7 +48,7 @@ You can link to an image in a repository on {% data variables.product.product_na
[[https://github.com/USERNAME/REPOSITORY/blob/main/img/octocat.png|alt=octocat]]
{% ifversion fpt or ghec or ghes > 3.6 or ghae > 3.6 %}
{% ifversion fpt or ghec or ghes or ghae > 3.6 %}
## Adding mathematical expressions and diagrams{% endif %}

View File

@@ -40,7 +40,7 @@ A {% data variables.product.prodname_GH_advanced_security %} license provides th
- **Dependency review** - Show the full impact of changes to dependencies and see details of any vulnerable versions before you merge a pull request. For more information, see "[AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review)."
{% ifversion ghes < 3.7 or ghae %}
{% ifversion ghae %}
<!-- Ref: ghae > 3.6 remove GHAE versioning from this section when the `security-overview-displayed-alerts` flag is toggled for GHAE -->
- **Security overview** - Review the security configuration and alerts for an organization and identify the repositories at greatest risk. For more information, see "[AUTOTITLE](/code-security/security-overview/about-security-overview)."
{% endif %}

View File

@@ -44,7 +44,7 @@ Some features are supported for additional languages or package managers. If you
{% note %}
{% ifversion ghae or ghes = 3.6 %}
{% ifversion ghae %}
**Note:** PHP{% ifversion ghae %}, Ruby,{% endif %} and Scala are supported for {% data variables.product.prodname_code_scanning %} by third-party actions.
{% else %}
**Notes:**

View File

@@ -63,7 +63,7 @@ You might fork a project to propose changes to the upstream repository. In this
1. Under "Owner," select the dropdown menu and click an owner for the forked repository.
1. By default, forks are named the same as their upstream repositories. Optionally, to further distinguish your fork, in the "Repository name" field, type a name.
1. Optionally, in the "Description" field, type a description of your fork.
{%- ifversion fpt or ghec or ghes > 3.6 or ghae > 3.6 %}
{%- ifversion fpt or ghec or ghes or ghae > 3.6 %}
1. Optionally, select **Copy the DEFAULT branch only**.
For many forking scenarios, such as contributing to open-source projects, you only need to copy the default branch. If you do not select this option, all branches will be copied into the new fork.

View File

@@ -12,7 +12,7 @@ To enable clear communication of mathematical expressions, {% data variables.pro
{% data variables.product.company_short %}'s math rendering capability uses MathJax; an open source, JavaScript-based display engine. MathJax supports a wide range of LaTeX macros, and several useful accessibility extensions. For more information, see [the MathJax documentation](http://docs.mathjax.org/en/latest/input/tex/index.html#tex-and-latex-support) and [the MathJax Accessibility Extensions Documentation](https://mathjax.github.io/MathJax-a11y/docs/#reader-guide).
Mathematical expressions rendering is available in {% data variables.product.prodname_github_issues %}, {% data variables.product.prodname_discussions %}, pull requests, {% ifversion fpt or ghec or ghes > 3.6 or ghae > 3.6 %}wikis, {% endif %}and Markdown files.
Mathematical expressions rendering is available in {% data variables.product.prodname_github_issues %}, {% data variables.product.prodname_discussions %}, pull requests, {% ifversion fpt or ghec or ghes or ghae > 3.6 %}wikis, {% endif %}and Markdown files.
## Writing inline expressions

View File

@@ -47,8 +47,8 @@ You can control whether organization members can create {% data variables.projec
{% data reusables.profile.org_settings %}
1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "table" aria-label="The table icon" %} Projects**.
1. Decide whether to allow members to create {% data variables.projects.projects_v1_boards %} in repositories in your organization. Then, under **{%ifversion ghes > 3.7 or ghae > 3.7 or ghec or fpt %}Projects (classic) only{% elsif ghes = 3.7 %}Repository projects{% else %}Projects{% endif %}**:
- To enable project boards in repositories, select **{% ifversion ghes < 3.7 %}Enable projects for all repositories{% else %}Allow members to enable Projects (classic) for all repositories{% endif %}**.
- To disable project boards in repositories, unselect **{% ifversion ghes < 3.7 %}Enable projects for all repositories{% else %}Allow members to enable Projects (classic) for all repositories{% endif %}**.
- To enable project boards in repositories, select **Allow members to enable Projects (classic) for all repositories**.
- To disable project boards in repositories, unselect **Allow members to enable Projects (classic) for all repositories**.
1. Click **Save**.
{% endif %}

View File

@@ -44,10 +44,6 @@ More than one commit | The pull request title, followed by the pull request numb
{% ifversion default-merge-squash-commit-message %}
People with maintainer or admin access to a repository can configure their repository's default merge message for all squashed commits to use the pull request title, the pull request title and commit details, or the pull request title and description. For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests)".{% endif %}
{% ifversion ghes = 3.6 %}
People with admin access to a repository can configure the repository to use the title of the pull request as the default merge message for all squashed commits. For more information, see "[AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests)".
{% endif %}
### Squashing and merging a long-running branch
If you plan to continue work on the [head branch](/get-started/quickstart/github-glossary#head-branch) of a pull request after the pull request is merged, we recommend you don't squash and merge the pull request.

View File

@@ -21,7 +21,7 @@ shortTitle: Configure commit squashing
{% data reusables.repositories.navigate-to-repo %}
{% data reusables.repositories.sidebar-settings %}
1. On the "General" settings page (which is selected by default), scroll down to the section marked "Pull Requests".
1. Under "Pull Requests", select **Allow squash merging**. This allows contributors to merge a pull request by squashing all commits into a single commit. The default commit message presented to contributors when merging is the commit title and message if the pull request contains only 1 commit, or the pull request title and list of commits if the pull request contains 2 or more commits. {% ifversion ghes = 3.6 %} To always use the title of the pull request regardless of the number of commits in the pull request select **Default to PR title for squash merge commits**.{% endif %}
1. Under "Pull Requests", select **Allow squash merging**. This allows contributors to merge a pull request by squashing all commits into a single commit. The default commit message presented to contributors when merging is the commit title and message if the pull request contains only 1 commit, or the pull request title and list of commits if the pull request contains 2 or more commits.
{% ifversion default-merge-squash-commit-message %}
1. Optionally, under **Allow squash merging**, select the dropdown menu, then click the format of the default squash commit message presented to contributors when merging.

View File

@@ -169,7 +169,7 @@ Before you can require a linear commit history, your repository must allow squas
{% endif %}
{% ifversion fpt or ghec or ghes > 3.6 %}
{% ifversion fpt or ghec or ghes %}
### Require deployments to succeed before merging

View File

@@ -30,7 +30,7 @@ Prerequisites for repository transfers:
- When you transfer a repository that you own to another personal account, the new owner will receive a confirmation email.{% ifversion fpt or ghec %} The confirmation email includes instructions for accepting the transfer. If the new owner doesn't accept the transfer within one day, the invitation will expire.{% endif %}
- To transfer a repository that you own to an organization, you must have permission to create a repository in the target organization.
- The target account must not have a repository with the same name, or a fork in the same network.
- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.{% ifversion ghes < 3.7 or ghae %}
- The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.{% ifversion ghae %}
- Internal repositories can't be transferred.{% endif %}
- Single repositories forked from a private upstream network cannot be transferred.
{%- ifversion ghec %}

View File

@@ -2,15 +2,13 @@
title: GitHub Actions OIDC
allowTitleToDifferFromFilename: true
shortTitle: OIDC
intro: >-
Use the REST API to interact with JWTs for OIDC subject claims in {% data
variables.product.prodname_actions %}.
intro: 'Use the REST API to interact with JWTs for OIDC subject claims in {% data variables.product.prodname_actions %}.'
topics:
- API
versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
versions:
fpt: '*'
ghec: '*'
ghes: '>=3.7'
ghes: '*'
autogenerated: rest
---

View File

@@ -1,10 +1,10 @@
---
title: Dependency submission
intro: Use the REST API to submit dependencies.
versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
versions:
fpt: '*'
ghec: '*'
ghes: '>=3.7'
ghes: '*'
autogenerated: rest
---

View File

@@ -1,10 +1,10 @@
---
title: Security Managers
intro: Use the REST API to manage security managers in an organization.
versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
versions:
fpt: '*'
ghec: '*'
ghes: '>=3.7'
ghes: '*'
topics:
- API
autogenerated: rest

View File

@@ -1,10 +1,10 @@
---
title: SSH signing keys
intro: Use the REST API to manage SSH signing keys of authenticated users.
versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
versions:
fpt: '*'
ghec: '*'
ghes: '>=3.7'
ghes: '*'
topics:
- API
allowTitleToDifferFromFilename: true

View File

@@ -1,4 +1,4 @@
{% ifversion fpt or ghec or ghes > 3.6 %}A self-hosted runner is automatically removed from {% data variables.product.product_name %} if it has not connected to {% data variables.product.prodname_actions %} for more than 14 days. An ephemeral self-hosted runner is automatically removed from {% data variables.product.product_name %} if it has not connected to {% data variables.product.prodname_actions %} for more than 1 day.
{% ifversion fpt or ghec or ghes %}A self-hosted runner is automatically removed from {% data variables.product.product_name %} if it has not connected to {% data variables.product.prodname_actions %} for more than 14 days. An ephemeral self-hosted runner is automatically removed from {% data variables.product.product_name %} if it has not connected to {% data variables.product.prodname_actions %} for more than 1 day.
{% elsif ghae or ghes < 3.7 %}A self-hosted runner is automatically removed from {% data variables.product.product_name %} if it has not connected to {% data variables.product.prodname_actions %} for more than 30 days.
{% elsif ghae %}A self-hosted runner is automatically removed from {% data variables.product.product_name %} if it has not connected to {% data variables.product.prodname_actions %} for more than 30 days.
{% endif %}

View File

@@ -1 +1 @@
{% ifversion ghes > 3.6 %}To use {% data variables.product.prodname_actions %} as a publishing source for {% data variables.product.prodname_pages %}, a site administrator must enable {% data variables.product.prodname_actions %} for {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/admin/github-actions/enabling-github-actions-for-github-enterprise-server)."{% endif %}
{% ifversion ghes %}To use {% data variables.product.prodname_actions %} as a publishing source for {% data variables.product.prodname_pages %}, a site administrator must enable {% data variables.product.prodname_actions %} for {% data variables.location.product_location %}. For more information, see "[AUTOTITLE](/admin/github-actions/enabling-github-actions-for-github-enterprise-server)."{% endif %}

View File

@@ -1,5 +1,5 @@
{% ifversion dependency-graph-repository-view-update %}
Dependencies submitted to a project using the Dependency submission API (beta) will show which detector was used for their submission and when they were submitted.
{% elsif ghes > 3.6 or ghae > 3.6 %}
{% elsif ghes or ghae > 3.6 %}
The dependency graph will display the submitted dependencies grouped by ecosystem, but separately from the dependencies parsed from manifest or lock files.
{% else %}{% endif %}

View File

@@ -1,2 +1,2 @@
{% ifversion dependency-submission-api %}
Additionally, you can use the Dependency submission API (beta) to submit dependencies from the package manager or ecosystem of your choice, even if the ecosystem is not supported by dependency graph for manifest or lock file analysis.{% endif %}{% ifversion dependency-graph-repository-view-update %} Dependencies submitted to a project using the Dependency submission API (beta) will show which detector was used for their submission and when they were submitted.{% elsif ghes > 3.6 or ghae > 3.6 %} The dependency graph will display the submitted dependencies grouped by ecosystem, but separately from the dependencies parsed from manifest or lock files.{% else %}{% endif %}{% ifversion dependency-submission-api %} For more information on the Dependency submission API, see "[AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api)."{% endif %}
Additionally, you can use the Dependency submission API (beta) to submit dependencies from the package manager or ecosystem of your choice, even if the ecosystem is not supported by dependency graph for manifest or lock file analysis.{% endif %}{% ifversion dependency-graph-repository-view-update %} Dependencies submitted to a project using the Dependency submission API (beta) will show which detector was used for their submission and when they were submitted.{% elsif ghes or ghae > 3.6 %} The dependency graph will display the submitted dependencies grouped by ecosystem, but separately from the dependencies parsed from manifest or lock files.{% else %}{% endif %}{% ifversion dependency-submission-api %} For more information on the Dependency submission API, see "[AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api)."{% endif %}

View File

@@ -1,12 +1,8 @@
{% ifversion ghes = 3.6 or ghes = 3.7 or ghes = 3.8 %}
{% ifversion ghes = 3.7 or ghes = 3.8 %}
{% note %}
{%- ifversion ghes = 3.6 %}
**Note**: The `http(s)://render.HOSTNAME` subdomain is deprecated in {% data variables.product.product_name %} 3.7 and later. After you upgrade to 3.7 or later, ensure that your TLS certificate covers the subdomains for the replacement services, `http(s)://notebooks.HOSTNAME` and `http(s)://viewscreen.HOSTNAME`.
{%- elsif ghes = 3.7 or ghes = 3.8 %}
{%- ifversion ghes = 3.7 or ghes = 3.8 %}
**Note**: The `http(s)://notebooks.HOSTNAME` or `http(s)://viewscreen.HOSTNAME` subdomains are new in {% data variables.product.product_name %} 3.7 and later, and replace `http(s)://render.HOSTNAME`. After you upgrade to 3.7 or later, your TLS certificate must cover the subdomain for the replacement services, `http(s)://notebooks.HOSTNAME` and `http(s)://viewscreen.HOSTNAME`.

View File

@@ -2,8 +2,6 @@
Security overview is available for organizations that use {% data variables.product.prodname_enterprise %}. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
{% elsif security-overview-displayed-alerts %}
All enterprises and their organizations have a security overview. If you use {% data variables.product.prodname_GH_advanced_security %} features{% ifversion ghae %}, which are free during the beta release,{% elsif ghec %}, which are free for public repositories,{% endif %} you will see additional information. {% data reusables.advanced-security.more-info-ghas %}
{% elsif ghes < 3.7 %}
Security overview for your organization is available if you have a license for {% data variables.product.prodname_GH_advanced_security %}. {% data reusables.advanced-security.more-info-ghas %}
{% elsif ghae %}
A security overview for your enterprise and for organizations is available if you use {% data variables.product.prodname_GH_advanced_security %}, which is free during the beta release. {% data reusables.advanced-security.more-info-ghas %}
{% endif %}

View File

@@ -1,7 +0,0 @@
{% ifversion ghes < 3.7 %}
{% note %}
**Note:** Vigilant mode is currently in beta and subject to change.
{% endnote %}
{% endif %}

View File

@@ -1,4 +1,4 @@
Hotpatch upgrades to GitHub Enterprise Server {% ifversion ghes = 3.6 %}3.6.2{% endif %} may fail. Upgrades with the full `.pkg` are unaffected. If the upgrade fails for your instance, workaround this issue by connecting to the administrative shell (ssh) and running the following non-interactive command:
Hotpatch upgrades to GitHub Enterprise Server may fail. Upgrades with the full `.pkg` are unaffected. If the upgrade fails for your instance, workaround this issue by connecting to the administrative shell (ssh) and running the following non-interactive command:
```shell
echo "grub-pc grub-pc/install_devices_empty boolean true" | sudo debconf-set-selections

View File

@@ -1,10 +0,0 @@
{% ifversion ghes = 3.6 %}
In some cases, GitHub Advanced Security customers who upgrade to GitHub Enterprise Server {{ allVersions[currentVersion].currentRelease }} may notice that alerts from secret scanning are missing in the web UI and REST API. To ensure the alerts remain visible, do not skip 3.4 as you upgrade to the latest release. To plan an upgrade through 3.4, see the [Upgrade assistant](https://support.github.com/enterprise/server-upgrade).
- To display the missing alerts for all repositories owned by an organization, organization owners can navigate to the organization's **Code security and analysis** settings, then click **Enable all** for secret scanning. For more information, see "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization#enabling-or-disabling-a-feature-for-all-existing-repositories)."
- To display the missing alerts for an individual repository, people with admin access to the repository can disable then enable secret scanning for the repository. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository)."
A fix is available in the {% ifversion ghes = 3.6 %}[3.6.1](/admin/release-notes#3.6.1){% endif %} patch release.
{% endif %}

View File

@@ -9,7 +9,7 @@ RSA keys (`ssh-rsa`) with a `valid_after` before November 2, 2021 may continue t
{% endnote %}
{% elsif ghes = 3.6 or ghes = 3.7 or ghes = 3.8 %}
{% elsif ghes = 3.7 or ghes = 3.8 %}
{% note %}