Skip to content

Commit 744ade8

Browse files
authored
Bug fixes for Enterprise content, 2022-09-29 (github#31278)
1 parent 5732212 commit 744ade8

File tree

8 files changed

+18
-9
lines changed

8 files changed

+18
-9
lines changed

content/authentication/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ You can authorize an existing personal access token, or [create a new personal a
2121
{% data reusables.user-settings.access_settings %}
2222
{% data reusables.user-settings.developer_settings %}
2323
{% data reusables.user-settings.personal_access_tokens %}
24-
3. Next to the token you'd like to authorize, click **Configure SSO**.
24+
3. Next to the token you'd like to authorize, click **Configure SSO**. {% data reusables.saml.authenticate-with-saml-at-least-once %}
25+
2526
![Screenshot of the dropdown menu to configure SSO for a personal access token](/assets/images/help/settings/sso-allowlist-button.png)
2627
4. To the right of the organization you'd like to authorize the token for, click **Authorize**.
2728
![Token authorize button](/assets/images/help/settings/token-authorize-button.png)

content/authentication/authenticating-with-saml-single-sign-on/authorizing-an-ssh-key-for-use-with-saml-single-sign-on.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You can authorize an existing SSH key, or create a new SSH key and then authoriz
2626

2727
{% data reusables.user-settings.access_settings %}
2828
{% data reusables.user-settings.ssh %}
29-
1. To the right of the SSH key you'd like to authorize, click **Configure SSO**.
29+
1. To the right of the SSH key you'd like to authorize, click **Configure SSO**. {% data reusables.saml.authenticate-with-saml-at-least-once %}
3030

3131
![Screenshot of the SSO token authorize button](/assets/images/help/settings/ssh-sso-button.png)
3232
1. To the right of the organization you'd like to authorize the SSH key for, click **Authorize**.

content/code-security/security-overview/filtering-alerts-in-the-security-overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ shortTitle: Filtering alerts
2525

2626
You can use filters in the security overview to narrow your focus based on a range of factors, like alert risk level, alert type and feature enablement. Different filters are available depending on the specific view and whether your analysis is at the organization, team or repository level.
2727

28+
{% ifversion security-overview-displayed-alerts %}
2829
{% note %}
2930
{% data reusables.security-overview.information-varies-GHAS %}
3031
{% endnote %}
32+
{% endif %}
3133

3234
## Filter by repository
3335

content/code-security/security-overview/viewing-the-security-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ intro: Navigate to the different views available in the security overview
44
permissions: '{% data reusables.security-overview.permissions %}'
55
product: '{% data reusables.gated-features.security-overview %}'
66
versions:
7-
ghae: '>= 3.5'
7+
ghae: '>= 3.4'
88
ghes: '*'
99
ghec: '*'
1010
type: how_to

content/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-dependency-review.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ Dependency review is included in {% data variables.product.product_name %} for p
3636
1. If "{% data variables.product.prodname_GH_advanced_security %}" is not enabled, click **Enable** next to the feature.
3737
![Screenshot of GitHub Advanced Security feature with "Enable" button emphasized](/assets/images/help/security/enable-ghas-private-repo.png)
3838

39-
{% elsif ghes %}
40-
Dependency review is available when dependency graph is enabled for {% data variables.product.product_location %} and {% data variables.product.prodname_advanced_security %} is enabled for the organization or repository. For more information, see "[Enabling {% data variables.product.prodname_GH_advanced_security %} for your enterprise](/admin/code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise)."
39+
{% elsif ghes or ghae %}
4140

42-
### Checking if the dependency graph is enabled
41+
Dependency review is available when dependency graph is enabled for {% data variables.product.product_location %} and {% data variables.product.prodname_advanced_security %} is enabled for the organization or repository.{% ifversion ghes %} For more information, see "[Enabling {% data variables.product.prodname_GH_advanced_security %} for your enterprise](/admin/code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise)."{% endif %}
4342

43+
### Checking if the dependency graph is enabled
4444

4545
{% data reusables.repositories.navigate-to-repo %}
4646
{% data reusables.repositories.sidebar-settings %}
@@ -49,6 +49,7 @@ Dependency review is available when dependency graph is enabled for {% data vari
4949
1. If dependency graph is enabled, click **Enable** next to "{% data variables.product.prodname_GH_advanced_security %}" to enable {% data variables.product.prodname_advanced_security %}, including dependency review. The enable button is disabled if your enterprise has no available licenses for {% data variables.product.prodname_advanced_security %}.{% ifversion ghes < 3.3 %}
5050
![Screenshot of "Code security and analysis" features"](/assets/images/enterprise/3.2/repository/code-security-and-analysis-enable-ghas-3.2.png){% endif %}{% ifversion ghes > 3.2 %}
5151
![Screenshot of "Code security and analysis" features"](/assets/images/enterprise/3.4/repository/code-security-and-analysis-enable-ghas-3.4.png){% endif %}
52+
5253
{% endif %}
5354

5455
{% ifversion dependency-review-action-configuration %}

data/features/commit-tree-view.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
versions:
44
fpt: '*'
55
ghec: '*'
6-
ghes: '>=3.6'
7-
ghae: '>= 3.8'
6+
ghes: '>=3.7'
7+
ghae: '>=3.7'
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
You can upgrade {% data variables.product.prodname_ghe_server %} to the latest patch release using a hotpatch, which does not require a maintenance window and usually does not require a reboot.
1+
You can upgrade {% data variables.product.prodname_ghe_server %} to the latest patch release using a hotpatch.
22

33
You can use hotpatching to upgrade to a newer patch release, but not a feature release. For example, you can upgrade from `2.10.1` to `2.10.5` because they are in the same feature series, but not from `2.10.9` to `2.11.0` because they are in a different feature series.
4+
5+
Hotpatches do not generally require a reboot. If a hotpatch does require a reboot, the {% data variables.product.product_name %} release notes will indicate the requirement.
6+
7+
Hotpatches require a configuration run, which can cause a brief period of errors or unresponsiveness for some or all services on {% data variables.product.product_location %}. You are not required to enable maintenance mode during installation of a hotpatch, but doing so will guarantee that users see a maintenance page instead of errors or timeouts. For more information, see "[Enabling and scheduling maintenance mode](/admin/configuration/configuring-your-enterprise/enabling-and-scheduling-maintenance-mode)."
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
If you don't see **Configure SSO**, ensure that you have authenticated at least once through your SAML IdP to access resources on {% data variables.product.product_location %}. For more information, see "[About authentication with SAML single sign-on](/authentication/authenticating-with-saml-single-sign-on/about-authentication-with-saml-single-sign-on)."

0 commit comments

Comments
 (0)