Skip to content

Commit f00dfc0

Browse files
authored
Merge branch 'main' into patch-1
2 parents ed587de + 57d3f1d commit f00dfc0

21 files changed

Lines changed: 71 additions & 165 deletions

.github/workflows/repo-freeze-check.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: Repo Freeze Check
22

33
on:
4-
pull_request:
4+
workflow_dispatch:
5+
pull_request_target:
56
types:
67
- opened
78
- reopened
@@ -21,7 +22,7 @@ jobs:
2122
runs-on: ubuntu-latest
2223
steps:
2324
- name: Fail if repo merges are paused
24-
if: ${{ env.FREEZE == 'true' }}
25+
if: ${{ env.FREEZE == 'true' && github.ref != 'refs/heads/repo-sync' }}
2526
run: |
2627
echo 'Merges into the "main" branch on this repo are currently paused!'
2728
exit 1

.github/workflows/repo-sync-stalls.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,7 @@ on:
55
schedule:
66
- cron: '0 */2 * * *'
77

8-
env:
9-
FREEZE: ${{ secrets.FREEZE }}
10-
118
jobs:
12-
check-freezer:
13-
name: Check for deployment freezes
14-
runs-on: ubuntu-latest
15-
steps:
16-
- name: Exit if repo is frozen
17-
if: ${{ env.FREEZE == 'true' }}
18-
run: |
19-
echo 'The repo is currently frozen! Exiting this workflow.'
20-
exit 1 # prevents further steps from running
21-
229
repo-sync-stalls:
2310
runs-on: ubuntu-latest
2411
steps:
@@ -60,7 +47,7 @@ jobs:
6047
})
6148
- name: Send Slack notification if workflow fails
6249
uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd
63-
if: failure()
50+
if: ${{ failure() }}
6451
with:
6552
channel: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
6653
bot-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}

.github/workflows/repo-sync.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,10 @@ on:
1111
schedule:
1212
- cron: '*/15 * * * *' # every 15 minutes
1313

14-
env:
15-
FREEZE: ${{ secrets.FREEZE }}
16-
1714
jobs:
18-
check-freezer:
19-
name: Check for deployment freezes
20-
runs-on: ubuntu-latest
21-
steps:
22-
- name: Exit if repo is frozen
23-
if: ${{ env.FREEZE == 'true' }}
24-
run: |
25-
echo 'The repo is currently frozen! Exiting this workflow.'
26-
exit 1 # prevents further steps from running
27-
2815
repo-sync:
2916
if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
3017
name: Repo Sync
31-
needs: check-freezer
3218
runs-on: ubuntu-latest
3319
steps:
3420
- name: Check out repo

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
days-before-pr-stale: 14
2929
days-before-pr-close: -1 # Never close
3030
remove-stale-when-updated: false
31+
operations-per-run: 100
3132
only-labels: 'waiting for review'
3233
# The hope is that by setting the stale-pr-label to the same label
3334
# as the label that the stale check looks for, this will result in
6.88 KB
Loading
16.3 KB
Loading

content/actions/managing-workflow-runs/adding-a-workflow-status-badge.md

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,52 +12,31 @@ versions:
1212

1313
{% data reusables.repositories.actions-workflow-status-badge-into %}
1414

15-
If your workflow uses the `name` keyword, you must reference the workflow by name. If the name of your workflow contains white space, you'll need to replace the space with the URL encoded string `%20`. For more information about the `name` keyword, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/articles/workflow-syntax-for-github-actions#name)."
15+
You reference the workflow by the name of your workflow file.
1616

1717
```
18-
https://github.com/<OWNER>/<REPOSITORY>/workflows/<WORKFLOW_NAME>/badge.svg
18+
https://github.com/<OWNER>/<REPOSITORY>/actions/workflows/<WORKFLOW_FILE>/badge.svg
1919
```
20+
### Using the workflow file name
2021

21-
Alternatively, if your workflow doesn't have a `name`, you must reference the workflow file using the file path relative to the repository's root directory.
22-
23-
{% note %}
24-
25-
**Note:** Referencing the workflow file using the file path does not work if the workflow has a `name`.
26-
27-
{% endnote %}
28-
29-
```
30-
https://github.com/<OWNER>/<REPOSITORY>/workflows/<WORKFLOW_FILE_PATH>/badge.svg
31-
```
32-
33-
### Using a workflow name
34-
35-
This Markdown example adds a status badge for a workflow with the name "Greet Everyone." The `OWNER` of the repository is the `actions` organization and the `REPOSITORY` name is `hello-world`.
36-
37-
```markdown
38-
![example workflow name](https://github.com/actions/hello-world/workflows/Greet%20Everyone/badge.svg)
39-
```
40-
41-
### Using a workflow file path
42-
43-
This Markdown example adds a status badge for a workflow with the file path `.github/workflows/main.yml`. The `OWNER` of the repository is the `actions` organization and the `REPOSITORY` name is `hello-world`.
22+
This Markdown example adds a status badge for a workflow with the file path `.github/workflows/main.yml`. The `OWNER` of the repository is the `github` organization and the `REPOSITORY` name is `docs`.
4423

4524
```markdown
46-
![example workflow file path](https://github.com/actions/hello-world/workflows/.github/workflows/main.yml/badge.svg)
25+
![example workflow](https://github.com/github/docs/actions/workflows/main.yml/badge.svg)
4726
```
4827

4928
### Using the `branch` parameter
5029

5130
This Markdown example adds a status badge for a branch with the name `feature-1`.
5231

5332
```markdown
54-
![example branch parameter](https://github.com/actions/hello-world/workflows/Greet%20Everyone/badge.svg?branch=feature-1)
33+
![example branch parameter](https://github.com/github/docs/actions/workflows/main.yml/badge.svg?branch=feature-1)
5534
```
5635

5736
### Using the `event` parameter
5837

5938
This Markdown example adds a badge that displays the status of workflow runs triggered by the `pull_request` event.
6039

6140
```markdown
62-
![example event parameter](https://github.com/actions/hello-world/workflows/Greet%20Everyone/badge.svg?event=pull_request)
41+
![example event parameter](https://github.com/github/docs/actions/workflows/main.yml/badge.svg?event=pull_request)
6342
```

content/actions/reference/events-that-trigger-workflows.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ The following steps occur to trigger a workflow run:
4141

4242
The `schedule` event allows you to trigger a workflow at a scheduled time.
4343

44+
{% note %}
45+
46+
Note: Due to load, the `schedule` event may be delayed
47+
48+
{% endnote %}
49+
4450
#### `schedule`
4551

4652
| Webhook event payload | Activity types | `GITHUB_SHA` | `GITHUB_REF` |
@@ -271,6 +277,12 @@ on:
271277
deployment_status
272278
```
273279

280+
{% note %}
281+
282+
**Note:** When a deployment status's state is set to `inactive`, a webhook event will not be created.
283+
284+
{% endnote %}
285+
274286
#### `fork`
275287

276288
Runs your workflow anytime when someone forks a repository, which triggers the `fork` event. For information about the REST API, see "[Create a fork](/rest/reference/repos#create-a-fork)."

content/github/managing-your-work-on-github/assigning-issues-and-pull-requests-to-other-github-users.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,29 @@ versions:
1111

1212
Anyone with write permissions to a repository can assign issues and pull requests.
1313

14+
### About issue and pull request assignees
15+
1416
You can assign up to 10 people to each issue or pull request, including yourself, anyone who has commented on the issue or pull request, anyone with write permissions to the repository, and organization members with read permissions to the repository. For more information, see "[Access permissions on {% data variables.product.prodname_dotcom %}](/articles/access-permissions-on-github)."
1517

18+
### Assigning an individual issue or pull request
19+
20+
{% data reusables.repositories.navigate-to-repo %}
21+
{% data reusables.repositories.sidebar-issue-pr %}
22+
3. Open the issue or pull request that you want to assign to someone.
23+
4. If no one is assigned to an issue or pull request, click **assign yourself** to assign yourself.
24+
![The assign yourself item](/assets/images/help/issues/assign_yourself.png)
25+
5. In the right side menu, click **Assignees**.
26+
![The Assignees menu item](/assets/images/help/issues/assignee_menu.png)
27+
6. To assign the issue or pull request to a user, start typing their username, then click their name when it appears. You can select and add up to ten assignees to an issue or pull request.
28+
![Issues assignment drop-down](/assets/images/help/issues/issues_assigning_dropdown.png)
29+
30+
### Assigning multiple issues or pull requests
31+
1632
{% data reusables.repositories.navigate-to-repo %}
1733
{% data reusables.repositories.sidebar-issue-pr %}
1834
3. Select the checkbox next to the items you want to assign to someone.
1935
![Issues metadata checkbox](/assets/images/help/issues/issues_assign_checkbox.png)
20-
4. In the upper-right corner, click **Assignee**.
36+
4. In the upper-right corner, click **Assign**.
2137
5. To assign the items to a user, start typing their username, then click their name when it appears. You can select and add up to ten assignees to an issue or pull request.
2238
![Issues assignment drop-down](/assets/images/help/issues/issues_assigning_dropdown.png)
2339

content/github/site-policy/github-additional-product-terms.md

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ versions:
44
free-pro-team: '*'
55
---
66

7-
Version Effective Date: December 14, 2020
7+
Version Effective Date: February 22, 2021
88

99
When you create an Account, you're given access to lots of different features and products that are all a part of the Service. Because many of these features and products offer different functionality, they may require additional terms and conditions specific to that feature or product. Below, we've listed those features and products, along with the corresponding additional terms that apply to your use of them.
1010

@@ -39,9 +39,24 @@ If you enable Git Large File Storage ("Git LFS") on your Account, you'll be able
3939

4040
### 4. Pages
4141

42-
Each Account comes with access to the [GitHub Pages static hosting service](/github/working-with-github-pages/about-github-pages). This hosting service is intended to host static web pages for All Users, but primarily as a showcase for personal and organizational projects. Some monetization efforts are permitted on Pages, such as donation buttons and crowdfunding links.
42+
Each Account comes with access to the [GitHub Pages static hosting service](/github/working-with-github-pages/about-github-pages). This hosting service is intended to host static web pages for All Users, but primarily as a showcase for personal and organizational projects.
4343

44-
GitHub Pages are subject to some specific bandwidth and usage limits, and may not be appropriate for some high-bandwidth uses or other prohibited uses. Please see our [GitHub Pages guidelines](/github/working-with-github-pages/about-github-pages) for more information. GitHub reserves the right at all times to reclaim any GitHub subdomain without liability.
44+
GitHub Pages is not intended for or allowed to be used as a free web hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). Some monetization efforts are permitted on Pages, such as donation buttons and crowdfunding links.
45+
46+
#### a. Bandwidth and Usage Limits
47+
GitHub Pages are subject to some specific bandwidth and usage limits, and may not be appropriate for some high-bandwidth uses. Please see our [GitHub Pages guidelines](/github/working-with-github-pages/about-github-pages) for more information.
48+
49+
#### b. Prohibited Uses
50+
Prohibited uses of GitHub Pages include
51+
- Content or activity that is illegal or otherwise prohibited by our [Terms of Service](/github/site-policy/github-terms-of-service), [Acceptable Use Policies](/github/site-policy/github-acceptable-use-policies) or [Community Guidelines](/github/site-policy/github-community-guidelines)
52+
- Violent or threatening content or activity
53+
- Excessive automated bulk activity (for example, spamming)
54+
- Activity that compromises GitHub users or GitHub services
55+
- Get-rich-quick schemes
56+
- Sexually obscene content
57+
- Content that misrepresents your identity or site purpose
58+
59+
If you have questions about whether your use or intended use falls into these categories, please contact [GitHub Support](https://support.github.com/contact) or [GitHub Premium Support](https://premium.githubsupport.com/). GitHub reserves the right at all times to reclaim any GitHub subdomain without liability.
4560

4661
### 5. Actions and Packages
4762

0 commit comments

Comments
 (0)