Skip to content

Commit b4b2873

Browse files
authored
Merge branch 'main' into patch-5
2 parents dd7ed2b + 406e27f commit b4b2873

92 files changed

Lines changed: 847 additions & 396 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/allowed-actions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = [
1010
'actions/labeler@5f867a63be70efff62b767459b009290364495eb', //actions/labeler@v2.2.0
1111
'actions/setup-node@56899e050abffc08c2b3b61f3ec6a79a9dc3223d', //actions/setup-node@v1.4.4
1212
'actions/setup-ruby@5f29a1cd8dfebf420691c4c9a0e832e2fae5a526', //actions/setup-ruby@v1.1.2
13-
'actions/stale@44f9eae0adddf72dbf3eedfacc999f70afcec1a8', //actions/stale@v3.0.12
13+
'actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4', //actions/stale@v3.0.13
1414
'crowdin/github-action@fd9429dd63d6c0f8a8cb4b93ad8076990bd6e688',
1515
'dawidd6/action-delete-branch@47743101a121ad657031e6704086271ca81b1911',
1616
'docker://chinthakagodawita/autoupdate-action:v1',

.github/workflows/60-days-stale-check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ jobs:
77
stale:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/stale@44f9eae0adddf72dbf3eedfacc999f70afcec1a8
10+
- uses: actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4
1111
with:
12-
repo-token: ${{ secrets.GITHUB_TOKEN }}
12+
repo-token: ${{ secrets.GITHUB_TOKEN }}
1313
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity.'
1414
stale-pr-message: 'This PR is stale because it has been open 60 days with no activity.'
1515
days-before-stale: 60

.github/workflows/merged-notification.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
name: Merged notification
12
on:
23
pull_request_target:
34
types: ['closed']
45

56
jobs:
67
comment:
7-
if: github.event.repository.private == false && github.event.pull_request.merged && github.event.pull_request.base.ref == github.event.repository.default_branch
8+
if: github.repository == 'github/docs' && github.event.pull_request.merged && github.event.pull_request.base.ref == github.event.repository.default_branch
89
runs-on: ubuntu-latest
910
steps:
1011
- uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9

.github/workflows/triage-stale-check.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
stale:
88
if: github.repository == 'github/docs'
99
runs-on: ubuntu-latest
10-
10+
1111
steps:
12-
- uses: actions/stale@44f9eae0adddf72dbf3eedfacc999f70afcec1a8
12+
- uses: actions/stale@af4072615903a8b031f986d25b1ae3bf45ec44d4
1313
with:
14-
repo-token: ${{ secrets.GITHUB_TOKEN }}
14+
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
stale-pr-message: 'This PR is stale because it has been open 7 days with no activity and will be automatically closed in 3 days. To keep this PR open, update the PR by adding a comment or pushing a commit.'
1616
days-before-stale: 7
1717
days-before-close: 10

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ A [pull request](https://docs.github.com/en/github/collaborating-with-issues-and
8989
When we merge those changes, they should be deployed to the live site within 24 hours. :earth_africa: To learn more about opening a pull request in this repo, see [Opening a pull request](#opening-a-pull-request) below.
9090

9191
### :question: Support
92-
We are a small team working hard to keep up with the documentation demands of a continously changing product. Unfortunately, we just can't help with support questions in this repository. If you are experiencing a problem with GitHub, unrelated to our documentation, please [contact GitHub Support directly](https://support.github.com/contact). Any issues, discussions, or pull requests opened here requesting support will be given information about how to contact GitHub Support, then closed and locked.
92+
We are a small team working hard to keep up with the documentation demands of a continuously changing product. Unfortunately, we just can't help with support questions in this repository. If you are experiencing a problem with GitHub, unrelated to our documentation, please [contact GitHub Support directly](https://support.github.com/contact). Any issues, discussions, or pull requests opened here requesting support will be given information about how to contact GitHub Support, then closed and locked.
9393

9494
If you're having trouble with your GitHub account, contact [Support](https://support.github.com/contact).
9595

@@ -129,7 +129,7 @@ Here's some information that might be helpful while working on a Docs PR:
129129

130130
- [Variables](/data/variables/README.md) - We use variables the same way we use reusables. Variables are for short strings of reusable text.
131131

132-
- [Liquid](/contribution/liquid-helpers.md) - We use liquid helpers to create different versions of our content.
132+
- [Liquid](/contributing/liquid-helpers.md) - We use liquid helpers to create different versions of our content.
133133

134134
- [Scripts](/script/README.md) - The scripts directory is the home for all of the scripts you can run locally.
135135

4.88 KB
Loading
50.2 KB
Loading
2.74 KB
Loading
7.82 KB
Loading
-13.6 KB
Loading

0 commit comments

Comments
 (0)