Skip to content

Commit b375039

Browse files
authored
Merge branch 'main' into new-badge-2020
2 parents 7e7addf + 8ea6df6 commit b375039

34 files changed

Lines changed: 269 additions & 24 deletions

app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"formation": {
1313
"web": {
1414
"quantity": 1,
15-
"size": "standard-1x"
15+
"size": "standard-2x"
1616
}
1717
}
1818
}
13.6 KB
Loading
-7.71 KB
Loading
-23.2 KB
Loading

content/actions/guides/building-and-testing-net.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
strategy:
4646
matrix:
47-
dotnet-version: [ '2.2.103', '3.0', '3.1.x' ]
47+
dotnet-version: ['3.0', '3.1.x', '5.0.x' ]
4848

4949
steps:
5050
- uses: actions/checkout@v2
@@ -81,7 +81,7 @@ jobs:
8181
runs-on: ubuntu-latest
8282
strategy:
8383
matrix:
84-
dotnet: [ '2.2.103', '3.0', '3.1.x' ]
84+
dotnet: [ '3.0', '3.1.x', '5.0.x' ]
8585
8686
steps:
8787
- uses: actions/checkout@v2
@@ -201,7 +201,7 @@ jobs:
201201
runs-on: ubuntu-latest
202202
strategy:
203203
matrix:
204-
dotnet-version: [ '2.2.103', '3.0', '3.1.x' ]
204+
dotnet-version: [ '3.0', '3.1.x', '5.0.x' ]
205205
206206
steps:
207207
- uses: actions/checkout@v2

content/admin/enterprise-support/about-github-premium-support-for-github-enterprise-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ In addition to all of the benefits of {% data variables.contact.enterprise_suppo
3737

3838
{% data reusables.support.signing-up-for-premium-support %}
3939

40-
{% data reusables.support.scope-of-support %} For more information, see "[Reaching {% data variables.product.prodname_ghe_server %} Support](/enterprise/admin/guides/enterprise-support/reaching-github-support)."
40+
{% data reusables.support.scope-of-support %}
4141

4242
{% data reusables.support.contacting-premium-support %}
4343

content/admin/enterprise-support/about-github-premium-support-for-github-enterprise.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ In addition to all of the benefits of {% data variables.contact.enterprise_suppo
3535

3636
{% data reusables.support.signing-up-for-premium-support %}
3737

38-
{% data reusables.support.scope-of-support %} For more information, see "[Reaching {% data variables.product.prodname_ghe_server %} Support](/enterprise/admin/guides/enterprise-support/reaching-github-support)."
38+
{% data reusables.support.scope-of-support %}
3939

4040
{% data reusables.support.contacting-premium-support %}
4141

content/admin/installation/installing-github-enterprise-server-on-hyper-v.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Installing GitHub Enterprise Server on Hyper-V
3-
intro: 'To install {% data variables.product.prodname_ghe_server %} on Hyper-V, you must deploy onto a machine running Windows Server 2008 through Windows Server 2016.'
3+
intro: 'To install {% data variables.product.prodname_ghe_server %} on Hyper-V, you must deploy onto a machine running Windows Server 2008 through Windows Server 2019.'
44
redirect_from:
55
- /enterprise/admin/guides/installation/installing-github-enterprise-on-hyper-v/
66
- /enterprise/admin/installation/installing-github-enterprise-server-on-hyper-v
@@ -13,7 +13,7 @@ topics:
1313
### Prerequisites
1414

1515
- {% data reusables.enterprise_installation.software-license %}
16-
- You must have Windows Server 2008 through Windows Server 2016, which support Hyper-V.
16+
- You must have Windows Server 2008 through Windows Server 2019, which support Hyper-V.
1717
- Most actions needed to create your virtual machine (VM) may also be performed using the [Hyper-V Manager](https://docs.microsoft.com/windows-server/virtualization/hyper-v/manage/remotely-manage-hyper-v-hosts). However, we recommend using the Windows PowerShell command-line shell for initial setup. Examples using PowerShell are included below. For more information, see the Microsoft guide "[Getting Started with Windows PowerShell](https://docs.microsoft.com/powershell/scripting/getting-started/getting-started-with-windows-powershell?view=powershell-5.1)."
1818

1919
### Hardware considerations

content/admin/user-management/customizing-user-messages-for-your-enterprise.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,15 @@ Mandatory messages have a variety of uses.
7272
- Telling users how to get help with {% data variables.product.product_location %}
7373
- Ensuring that all users read your terms of service for using {% data variables.product.product_location %}
7474

75-
{% note %}
76-
77-
**Note:** After you configure a mandatory message for {% data variables.product.product_location %}, you cannot change or remove the message.
75+
If you include Markdown checkboxes in the message, all checkboxes must be selected before the user can dismiss the message. For example, if you include your terms of service in the mandatory message, you can require that each user selects a checkbox to confirm the user has read the terms.
7876

79-
{% endnote %}
77+
Each time a user sees a mandatory message, an audit log event is created. The event includes the version of the message that the user saw. For more information see "[Audited actions](/admin/user-management/audited-actions)."
8078

79+
{% note %}
8180

82-
If you include Markdown checkboxes in the message, all checkboxes must be selected before the user can dismiss the message. For example, if you include your terms of service in the mandatory message, you can require that each user selects a checkbox to confirm the user has read the terms.
81+
**Note:** If you change the mandatory message for {% data variables.product.product_location %}, users who have already acknowledged the message will not see the new message.
8382

84-
Each time a user sees a mandatory message, an audit log event is created. The event includes the version of the message that the user saw. For more information see "[Audited actions](/admin/user-management/audited-actions)."
83+
{% endnote %}
8584

8685
{% data reusables.enterprise-accounts.access-enterprise %}
8786
{% data reusables.enterprise-accounts.settings-tab %}

content/code-security/security-advisories/editing-a-security-advisory.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ You can credit people who helped discover, report, or fix a security vulnerabili
1717

1818
If someone accepts credit, the person's username appears in the "Credits" section of the security advisory. Anyone with read access to the repository can see the advisory and the people who accepted credit for it.
1919

20+
If you believe you should be credited for a security advisory, please contact the person who created the advisory and ask them to edit the advisory to include your credit. Only the creator of the advisory can credit you, so please don't contact GitHub Support about credits for security advisories.
21+
2022
### Editing a security advisory
2123

2224
{% data reusables.repositories.navigate-to-repo %}

0 commit comments

Comments
 (0)