Skip to content

Commit bb92009

Browse files
authored
Merge pull request #33457 from github/repo-sync
Repo sync
2 parents 0572f33 + dbb3845 commit bb92009

File tree

18 files changed

+54
-17
lines changed

18 files changed

+54
-17
lines changed

content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/requiring-two-factor-authentication-for-an-organization.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ For more information, see "[AUTOTITLE](/authentication/securing-your-account-wit
2626

2727
Before you can require organization members and outside collaborators to use 2FA, you must [enable two-factor authentication](/authentication/securing-your-account-with-two-factor-authentication-2fa) for your own personal account.
2828

29+
Before you require use of two-factor authentication, we recommend notifying organization members and outside collaborators and asking them to set up 2FA for their accounts. You can [see if members and outside collaborators already use 2FA](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/viewing-whether-users-in-your-organization-have-2fa-enabled) on an organization's People tab.
30+
31+
{% data reusables.two_fa.ghes_ntp %}
32+
2933
{% warning %}
3034

3135
**Warnings:**
@@ -36,7 +40,7 @@ Before you can require organization members and outside collaborators to use 2FA
3640

3741
{% endwarning %}
3842

39-
Before you require use of two-factor authentication, we recommend notifying organization members and outside collaborators and asking them to set up 2FA for their accounts. You can [see if members and outside collaborators already use 2FA](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/viewing-whether-users-in-your-organization-have-2fa-enabled) on an organization's People tab.
43+
## Requiring two-factor authentication for an organization
4044

4145
{% data reusables.profile.access_org %}
4246
{% data reusables.profile.org_settings %}

content/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-security-settings-in-your-enterprise.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ You can enforce policies to control the security settings for organizations owne
3737

3838
Before you can require 2FA for all organizations owned by your enterprise, you must enable two-factor authentication for your own account. For more information, see "[AUTOTITLE](/authentication/securing-your-account-with-two-factor-authentication-2fa)."
3939

40+
Before you require use of two-factor authentication, we recommend notifying organization members, outside collaborators, and billing managers and asking them to set up 2FA for their accounts. Organization owners can see if members and outside collaborators already use 2FA on each organization's People page. For more information, see "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/viewing-whether-users-in-your-organization-have-2fa-enabled)."
41+
42+
{% data reusables.two_fa.ghes_ntp %}
43+
4044
{% warning %}
4145

4246
**Warnings:**
@@ -47,8 +51,6 @@ Before you can require 2FA for all organizations owned by your enterprise, you m
4751

4852
{% endwarning %}
4953

50-
Before you require use of two-factor authentication, we recommend notifying organization members, outside collaborators, and billing managers and asking them to set up 2FA for their accounts. Organization owners can see if members and outside collaborators already use 2FA on each organization's People page. For more information, see "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-two-factor-authentication-for-your-organization/viewing-whether-users-in-your-organization-have-2fa-enabled)."
51-
5254
{% ifversion mandatory-2fa-dotcom-contributors %}
5355

5456
{% note %}

content/code-security/code-scanning/managing-your-code-scanning-configuration/c-cpp-built-in-queries.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ intro: 'Explore the queries that {% data variables.product.prodname_codeql %} us
55
product: '{% data reusables.gated-features.code-scanning %}'
66
allowTitleToDifferFromFilename: true
77
versions:
8-
feature: code-scanning-without-workflow
8+
fpt: '*'
9+
ghes: '*'
10+
ghec: '*'
911
type: reference
1012
topics:
1113
- Code scanning

content/code-security/code-scanning/managing-your-code-scanning-configuration/codeql-query-suites.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ shortTitle: CodeQL query suites
44
intro: 'You can choose from different built-in {% data variables.product.prodname_codeql %} query suites to use in your {% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} setup.'
55
product: '{% data reusables.gated-features.code-scanning %}'
66
versions:
7-
feature: code-scanning-without-workflow
7+
fpt: '*'
8+
ghes: '*'
9+
ghec: '*'
810
redirect_from:
911
- /code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/built-in-codeql-query-suites
1012
- /code-security/code-scanning/managing-your-code-scanning-configuration/built-in-codeql-query-suites

content/code-security/code-scanning/managing-your-code-scanning-configuration/csharp-built-in-queries.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ intro: 'Explore the queries that {% data variables.product.prodname_codeql %} us
55
product: '{% data reusables.gated-features.code-scanning %}'
66
allowTitleToDifferFromFilename: true
77
versions:
8-
feature: code-scanning-without-workflow
8+
fpt: '*'
9+
ghes: '*'
10+
ghec: '*'
911
type: reference
1012
topics:
1113
- Code scanning

content/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ shortTitle: Edit default setup
44
intro: 'You can edit your existing configuration of default setup for {% data variables.product.prodname_code_scanning %} to better meet your code security needs.'
55
product: '{% data reusables.gated-features.code-scanning %}'
66
versions:
7-
feature: code-scanning-without-workflow
7+
fpt: '*'
8+
ghes: '*'
9+
ghec: '*'
810
type: how_to
911
topics:
1012
- Code scanning

content/code-security/code-scanning/managing-your-code-scanning-configuration/go-built-in-queries.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ intro: 'Explore the queries that {% data variables.product.prodname_codeql %} us
55
product: '{% data reusables.gated-features.code-scanning %}'
66
allowTitleToDifferFromFilename: true
77
versions:
8-
feature: code-scanning-without-workflow
8+
fpt: '*'
9+
ghes: '*'
10+
ghec: '*'
911
type: reference
1012
topics:
1113
- Code scanning

content/code-security/code-scanning/managing-your-code-scanning-configuration/java-kotlin-built-in-queries.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ intro: 'Explore the queries that {% data variables.product.prodname_codeql %} us
55
product: '{% data reusables.gated-features.code-scanning %}'
66
allowTitleToDifferFromFilename: true
77
versions:
8-
feature: code-scanning-without-workflow
8+
fpt: '*'
9+
ghes: '*'
10+
ghec: '*'
911
type: reference
1012
topics:
1113
- Code scanning

content/code-security/code-scanning/managing-your-code-scanning-configuration/javascript-typescript-built-in-queries.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ intro: 'Explore the queries that {% data variables.product.prodname_codeql %} us
55
product: '{% data reusables.gated-features.code-scanning %}'
66
allowTitleToDifferFromFilename: true
77
versions:
8-
feature: code-scanning-without-workflow
8+
fpt: '*'
9+
ghes: '*'
10+
ghec: '*'
911
type: reference
1012
topics:
1113
- Code scanning

content/code-security/code-scanning/managing-your-code-scanning-configuration/python-built-in-queries.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ intro: 'Explore the queries that {% data variables.product.prodname_codeql %} us
55
product: '{% data reusables.gated-features.code-scanning %}'
66
allowTitleToDifferFromFilename: true
77
versions:
8-
feature: code-scanning-without-workflow
8+
fpt: '*'
9+
ghes: '*'
10+
ghec: '*'
911
type: reference
1012
topics:
1113
- Code scanning

content/code-security/code-scanning/managing-your-code-scanning-configuration/ruby-built-in-queries.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ intro: 'Explore the queries that {% data variables.product.prodname_codeql %} us
55
product: '{% data reusables.gated-features.code-scanning %}'
66
allowTitleToDifferFromFilename: true
77
versions:
8-
feature: code-scanning-without-workflow
8+
fpt: '*'
9+
ghes: '*'
10+
ghec: '*'
911
type: reference
1012
topics:
1113
- Code scanning

content/code-security/code-scanning/managing-your-code-scanning-configuration/swift-built-in-queries.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ intro: 'Explore the queries that {% data variables.product.prodname_codeql %} us
55
product: '{% data reusables.gated-features.code-scanning %}'
66
allowTitleToDifferFromFilename: true
77
versions:
8-
feature: code-scanning-without-workflow
8+
fpt: '*'
9+
ghes: '*'
10+
ghec: '*'
911
type: reference
1012
topics:
1113
- Code scanning

content/code-security/code-scanning/troubleshooting-code-scanning/enabling-default-setup-takes-too-long.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ title: 'Enabling default setup takes too long'
33
intro: 'If you think that enabling default setup has stalled, you can restart the process.'
44
allowTitleToDifferFromFilename: true
55
versions:
6-
feature: code-scanning-without-workflow
6+
fpt: '*'
7+
ghes: '*'
8+
ghec: '*'
79
---
810

911

content/code-security/code-scanning/troubleshooting-code-scanning/results-different-than-expected.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ shortTitle: Results different than expected
44
intro: 'If your {% data variables.product.prodname_code_scanning %} results are different than you expected, you can check which configurations are active.'
55
allowTitleToDifferFromFilename: true
66
versions:
7-
feature: code-scanning-without-workflow
7+
fpt: '*'
8+
ghes: '*'
9+
ghec: '*'
810
redirect_from:
911
- /code-security/code-scanning/troubleshooting-code-scanning/results-are-different-than-expected
1012
---

content/code-security/code-scanning/troubleshooting-code-scanning/two-codeql-workflows.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ title: 'Two CodeQL workflows'
33
allowTitleToDifferFromFilename: true
44
intro: 'If you see two workflows named "{% data variables.product.prodname_codeql %}", one workflow may be a pre-existing {% data variables.product.prodname_codeql %} workflow file which has been disabled by default setup.'
55
versions:
6-
feature: code-scanning-without-workflow
6+
fpt: '*'
7+
ghes: '*'
8+
ghec: '*'
79
---
810

911
{% data reusables.code-scanning.codeql-action-version-ghes %}

content/code-security/code-scanning/troubleshooting-code-scanning/unclear-what-triggered-a-workflow.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ shortTitle: Unclear what triggered a workflow
44
intro: 'If you don''t know what triggered an analysis, {% ifversion code-scanning-tool-status-page %} investigate the {% data variables.code-scanning.tool_status_page %} or {% endif %}look at the log for the last scan.'
55
allowTitleToDifferFromFilename: true
66
versions:
7-
feature: code-scanning-without-workflow
7+
fpt: '*'
8+
ghes: '*'
9+
ghec: '*'
810
redirect_from:
911
- /code-security/code-scanning/troubleshooting-code-scanning/unclear-what-triggered-a-workflow-run
1012
---

content/packages/working-with-a-github-packages-registry/working-with-the-docker-registry.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ Docker images previously stored in the Docker registry are being automatically m
3434

3535
When installing or publishing a Docker image, the Docker registry does not currently support foreign layers, such as Windows images.
3636

37+
Docker Engine v25 is not compatible with the Docker Registry on {% data variables.product.prodname_ghe_server %}. We recommend using {% data variables.product.prodname_container_registry %} instead. For information on migrating, see "[AUTOTITLE](/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry)."
38+
3739
## Authenticating to {% data variables.product.prodname_registry %}
3840

3941
{% data reusables.package_registry.authenticate-packages %}

data/reusables/two_fa/ghes_ntp.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{% ifversion ghes %}The verification of two-factor authentication codes requires an accurate time on both the client's device and server. Site administrators should ensure time synchronization is configured and accurate. For more information, see "[AUTOTITLE](/admin/configuration/configuring-network-settings/configuring-time-synchronization)."{% endif %}

0 commit comments

Comments
 (0)