Skip to content

Commit 1b7df82

Browse files
authored
Merge branch 'main' into patch-2
2 parents 3c6a586 + 1e20865 commit 1b7df82

File tree

284 files changed

+3379
-1534
lines changed

Some content is hidden

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

284 files changed

+3379
-1534
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,11 @@ package.json @github/docs-engineering
2424
/translations/log/ @github/docs-localization @Octomerger
2525

2626
# Site Policy
27-
/content/github/site-policy/ @github/site-policy-admins
27+
/content/site-policy/ @github/site-policy-admins
2828

2929
# Content strategy
3030
/contributing/content-markup-reference.md @github/docs-content-strategy
3131
/contributing/content-style-guide.md @github/docs-content-strategy
3232
/contributing/content-model.md @github/docs-content-strategy
3333
/contributing/content-style-guide.md @github/docs-content-strategy
3434
/contributing/content-templates.md @github/docs-content-strategy
35-
36-
# Make sure that Octokit maintainers get notified about changes
37-
# relevant to the Octokit libraries (https://github.com/octokit)
38-
/content/rest/reference @github/octokit-maintainers

.github/workflows/optimize-images.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ jobs:
2323
uses: actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579
2424
with:
2525
ref: ${{ github.head_ref }}
26+
# Need to specify a PAT here because otherwise GITHUB_TOKEN is used
27+
# by default. Workflows won't trigger in that case because actions
28+
# performed with GITHUB_TOKEN don't trigger other workflows.
29+
token: ${{ secrets.DOCUBOT_REPO_PAT }}
2630

2731
- name: Check out base ref
2832
run: git fetch --no-tags --depth=1 origin $GITHUB_BASE_REF
Loading
Loading

components/article/ToolPicker.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ const supportedTools = [
2020
'vscode',
2121
'importer_cli',
2222
'graphql',
23+
'powershell',
24+
'bash',
2325
]
2426
const toolTitles = {
2527
webui: 'Web browser',
@@ -30,6 +32,8 @@ const toolTitles = {
3032
vscode: 'Visual Studio Code',
3133
importer_cli: 'GitHub Enterprise Importer CLI',
3234
graphql: 'GraphQL API',
35+
powershell: 'PowerShell',
36+
bash: 'Bash',
3337
} as Record<string, string>
3438

3539
// Imperatively modify article content to show only the selected tool

content/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ defaultPlatform: linux
228228
### `defaultTool`
229229

230230
- Purpose: Override the initial tool selection for a page, where tool refers to the application the reader is using to work with GitHub (such as GitHub.com's web UI, the GitHub CLI, or GitHub Desktop) or the GitHub APIs (such as cURL or the GitHub CLI). For more information about the tool selector, see [Markup reference for GitHub Docs](../contributing/content-markup-reference.md#tool-tags). If this frontmatter is omitted, then the tool-specific content matching the GitHub web UI is shown by default. If a user has indicated a tool preference (by clicking on a tool tab), then the user's preference will be applied instead of the default value.
231-
- Type: `String`, one of: `webui`, `cli`, `desktop`, `curl`, `codespaces`, `vscode`, `importer_cli`, `graphql`.
231+
- Type: `String`, one of: `webui`, `cli`, `desktop`, `curl`, `codespaces`, `vscode`, `importer_cli`, `graphql`, `powershell`, `bash`.
232232
- Optional.
233233

234234
```yaml

content/account-and-profile/setting-up-and-managing-your-github-user-account/managing-user-account-settings/about-your-personal-dashboard.md

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,23 @@ You can also find a list of your recently visited repositories, teams, and proje
4040

4141
## Staying updated with activity from the community
4242

43-
In the "All activity" section of your news feed, you can view updates from repositories you're subscribed to and people you follow. The "All activity" section shows updates from repositories you watch or have starred, and from users you follow.
43+
{% if for-you-feed %}
44+
The main section of your dashboard has two activity feeds:
45+
46+
- Following: Activity by people you follow and from repositories you watch.
47+
- For you: Activity and recommendations based on your {% data variables.product.product_name %} network.
48+
49+
### Following feed
50+
51+
This feed shows activity from repositories and users you have shown a direct interest in, by following a user or watching a repository. For example, you'll see updates when a user you follow:
52+
53+
{% else %}
54+
In the "All activity" section of your news feed, you can view updates from repositories you watch and users you follow.
4455

4556
You'll see updates in your news feed when a user you follow:
57+
{% endif %}
58+
59+
4660
- Stars a repository.
4761
- Follows another user.{% ifversion fpt or ghes or ghec %}
4862
- Creates a public repository.{% endif %}
@@ -51,7 +65,26 @@ You'll see updates in your news feed when a user you follow:
5165
- Forks a public repository.{% endif %}
5266
- Publishes a new release.
5367

54-
For more information about starring repositories and following people, see "[Saving repositories with stars](/articles/saving-repositories-with-stars/)" and "[Following people](/articles/following-people)."
68+
For more information about starring repositories and following people, see "[Following people](/articles/following-people)" and "[Be social](/get-started/quickstart/be-social)."
69+
70+
{% if for-you-feed %}
71+
### For you feed
72+
73+
{% note %}
74+
75+
**Note:** This new tab is currently in public beta and subject to change.
76+
77+
{% endnote %}
78+
79+
This feed shows activity and recommendations based on your network on {% data variables.product.product_name %}. It's designed to provide updates that inspire you, keep you up-to-date, and help you find new communities you want to participate in. Your network includes:
80+
81+
- Repositories you have starred
82+
- Repositories you've contributed to
83+
- Users you follow or sponsor
84+
- Users you've collaborated with
85+
- Organizations you follow
86+
87+
{% endif %}
5588

5689
## Exploring recommended repositories
5790

content/actions/hosting-your-own-runners/managing-access-to-self-hosted-runners-using-groups.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ shortTitle: Manage access to runners
1414

1515
{% data reusables.actions.enterprise-beta %}
1616
{% data reusables.actions.enterprise-github-hosted-runners %}
17-
{% data reusables.actions.restrict-runner-workflow-beta %}
1817

1918
## About self-hosted runner groups
2019

0 commit comments

Comments
 (0)