Skip to content

Commit d4602af

Browse files
authored
Merge branch 'main' into add-no-response-workflow
2 parents 95511cf + deb617b commit d4602af

27 files changed

Lines changed: 199 additions & 132 deletions

.github/workflows/send-prs-to-how-how-we-work-boards.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,15 @@ jobs:
3535
3636
var column_id = 13445681;
3737
try {
38-
github.projects.createCard({
38+
await github.projects.createCard({
3939
column_id: column_id,
4040
content_id: context.payload.pull_request.id,
4141
content_type: "PullRequest"
4242
});
4343
} catch (error) {
44-
console.log(error);
44+
if (error.includes('Project already has the associated issue')) {
45+
return
46+
} else {
47+
console.log(error);
48+
}
4549
}

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
}

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/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 %}

content/github/getting-started-with-github/keyboard-shortcuts.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Below is a list of some of the available keyboard shortcuts.
5252
|<kbd>control z</kbd> or <kbd>command z</kbd> | Undo
5353
|<kbd>control y</kbd> or <kbd>command y</kbd> | Redo
5454
|<kbd>cmd + shift + p</kbd> | Toggles between the **Edit file** and **Preview changes** tabs
55+
|<kbd>control s</kbd> or <kbd>command s</kbd> | Write a commit message
5556

5657
For more keyboard shortcuts, see the [CodeMirror documentation](https://codemirror.net/doc/manual.html#commands).
5758

content/index.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,42 @@ featuredLinks:
1313
- /github/getting-started-with-github/managing-remote-repositories
1414
- /github/working-with-github-pages
1515
versions: '*'
16+
children:
17+
- github
18+
- admin
19+
- discussions
20+
- code-security
21+
- actions
22+
- packages
23+
- developers
24+
- rest
25+
- graphql
26+
- insights
27+
- communities
28+
- pages
29+
- education
30+
- desktop
31+
- early-access
32+
externalProducts:
33+
cli:
34+
id: cli
35+
name: GitHub CLI
36+
href: 'https://cli.github.com/manual'
37+
external: true
38+
atom:
39+
id: atom
40+
name: Atom
41+
href: 'https://atom.io/docs'
42+
external: true
43+
electron:
44+
id: electron
45+
name: Electron
46+
href: 'https://electronjs.org/docs'
47+
external: true
48+
codeql:
49+
id: codeql
50+
name: 'CodeQL'
51+
href: 'https://codeql.github.com/docs'
52+
external: true
1653
---
1754

data/graphql/ghae/schema.docs-ghae.graphql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31523,6 +31523,11 @@ type Sponsorship implements Node {
3152331523
The entity that is being sponsored
3152431524
"""
3152531525
sponsorable: Sponsorable!
31526+
31527+
"""
31528+
Identifies the date and time when the current tier was chosen for this sponsorship.
31529+
"""
31530+
tierSelectedAt: DateTime
3152631531
}
3152731532

3152831533
"""

data/graphql/schema.docs.graphql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34459,6 +34459,11 @@ type Sponsorship implements Node {
3445934459
The associated sponsorship tier
3446034460
"""
3446134461
tier: SponsorsTier
34462+
34463+
"""
34464+
Identifies the date and time when the current tier was chosen for this sponsorship.
34465+
"""
34466+
tierSelectedAt: DateTime
3446234467
}
3446334468

3446434469
"""

data/products.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

data/reusables/secret-scanning/partner-secret-list-public-repo.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ Proctorio | Proctorio Registration Key
5050
Proctorio | Proctorio Secret Key
5151
Pulumi | Pulumi Access Token
5252
PyPI | PyPI API Token
53+
RubyGems | RubyGems API Key
5354
Samsara | Samsara API Token
5455
Samsara | Samsara OAuth Access Token
5556
Shopify | Shopify App Shared Secret

0 commit comments

Comments
 (0)