Skip to content

Commit 70047a7

Browse files
authored
Merge branch 'main' into patch-2
2 parents dd2f6f1 + 1c99389 commit 70047a7

885 files changed

Lines changed: 12164 additions & 9508 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/workflows/create-translation-batch-pr.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,15 @@ jobs:
6262
- name: Remove unwanted git hooks
6363
run: rm .git/hooks/post-checkout
6464

65-
- name: Install Crowdin CLI
65+
# https://support.crowdin.com/cli-tool/#debian
66+
- name: Download and install the public signing key
67+
run: wget -qO - https://artifacts.crowdin.com/repo/GPG-KEY-crowdin | sudo apt-key add -
68+
- name: Create the crowdin.list file in the /etc/apt/sources.list.d directory
6669
run: |
67-
wget https://artifacts.crowdin.com/repo/deb/crowdin3.deb -O /tmp/crowdin.deb
68-
sudo dpkg -i /tmp/crowdin.deb
70+
sudo touch /etc/apt/sources.list.d/crowdin.list
71+
echo "deb https://artifacts.crowdin.com/repo/deb/ /" | sudo tee -a /etc/apt/sources.list.d/crowdin.list
72+
- name: Install the Crowdin CLI Debian Package
73+
run: sudo apt-get update && sudo apt-get install crowdin3
6974

7075
# Delete empty source files that would be rejected by Crowdin breaking the workflow
7176
- name: Remove empty source files
@@ -169,8 +174,9 @@ jobs:
169174
gh pr create --title "New translation batch for ${{ matrix.language }}" \
170175
--base=main \
171176
--head=${{ steps.set-branch.outputs.BRANCH_NAME }} \
172-
--body-file /tmp/pr-body.txt || git push origin :${{ steps.set-branch.outputs.BRANCH_NAME }} \
173-
--label "translation-batch"
177+
--label "translation-batch-${{ matrix.language }}" \
178+
--label "translation-batch" \
179+
--body-file /tmp/pr-body.txt || git push origin :${{ steps.set-branch.outputs.BRANCH_NAME }}
174180
175181
- name: Approve PR
176182
if: github.ref_name == 'main'

components/guides/ArticleCard.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ export const ArticleCard = ({ card, typeLabel }: Props) => {
1919
<ul style={{ listStyleType: 'none' }}>
2020
{card.topics.map((topic) => {
2121
return (
22-
<li className="d-inline-block">
22+
<li className="d-inline-block" key={topic}>
2323
<Label
24-
key={topic}
2524
data-testid="article-card-topic"
2625
variant="small"
2726
sx={{ bg: 'accent.emphasis', mr: 1 }}

content/account-and-profile/managing-subscriptions-and-notifications-on-github/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Managing subscriptions and notifications on GitHub
33
intro: 'You can specify how to receive notifications, the repositories you are interested in, and the types of activity you want to hear about.'
44
redirect_from:
5-
- /categories/76/articles/
6-
- /categories/notifications/
5+
- /categories/76/articles
6+
- /categories/notifications
77
- /categories/receiving-notifications-about-activity-on-github
88
- /github/managing-subscriptions-and-notifications-on-github
99
versions:

content/account-and-profile/managing-subscriptions-and-notifications-on-github/managing-subscriptions-for-activity-on-github/viewing-your-subscriptions.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
title: Viewing your subscriptions
33
intro: 'To understand where your notifications are coming from and your notifications volume, we recommend reviewing your subscriptions and watched repositories regularly.'
44
redirect_from:
5-
- /articles/subscribing-to-conversations/
6-
- /articles/unsubscribing-from-conversations/
5+
- /articles/subscribing-to-conversations
6+
- /articles/unsubscribing-from-conversations
77
- /articles/subscribing-to-and-unsubscribing-from-notifications
88
- /articles/listing-the-issues-and-pull-requests-youre-subscribed-to
9-
- /articles/watching-repositories/
10-
- /articles/unwatching-repositories/
9+
- /articles/watching-repositories
10+
- /articles/unwatching-repositories
1111
- /articles/watching-and-unwatching-repositories
1212
- /articles/watching-and-unwatching-releases-for-a-repository
1313
- /articles/watching-and-unwatching-team-discussions
14-
- /articles/listing-watched-repositories/
14+
- /articles/listing-watched-repositories
1515
- /articles/listing-the-repositories-you-re-watching
1616
- /articles/listing-the-repositories-youre-watching
1717
- /github/managing-subscriptions-and-notifications-on-github/viewing-your-subscriptions

content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/about-notifications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: About notifications
33
intro: 'Notifications provide updates about the activity on {% data variables.product.product_location %} that you''ve subscribed to. You can use the notifications inbox to customize, triage, and manage your updates.'
44
redirect_from:
5-
- /articles/notifications/
5+
- /articles/notifications
66
- /articles/about-notifications
77
- /github/managing-subscriptions-and-notifications-on-github/about-notifications-beta
88
- /github/managing-subscriptions-and-notifications-on-github/about-notifications

content/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ title: Configuring notifications
33
intro: 'Choose the type of activity on {% data variables.product.prodname_dotcom %} that you want to receive notifications for and how you want these updates delivered.'
44
redirect_from:
55
- /articles/about-web-notifications
6-
- /format-of-notification-emails/
7-
- /articles/configuring-notification-emails/
8-
- /articles/about-notification-emails/
6+
- /format-of-notification-emails
7+
- /articles/configuring-notification-emails
8+
- /articles/about-notification-emails
99
- /articles/about-email-notifications
1010
- /articles/accessing-your-notifications
11-
- /articles/configuring-notification-delivery-methods/
12-
- /articles/managing-notification-delivery-methods/
13-
- /articles/managing-notification-emails-for-organizations/
11+
- /articles/configuring-notification-delivery-methods
12+
- /articles/managing-notification-delivery-methods
13+
- /articles/managing-notification-emails-for-organizations
1414
- /articles/choosing-the-delivery-method-for-your-notifications
15-
- /articles/choosing-the-types-of-notifications-you-receive/
15+
- /articles/choosing-the-types-of-notifications-you-receive
1616
- /github/managing-subscriptions-and-notifications-on-github/configuring-notifications
1717
- /github/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications
1818
versions:

content/account-and-profile/managing-subscriptions-and-notifications-on-github/viewing-and-triaging-notifications/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Viewing and triaging notifications
33
intro: 'To optimize your notifications workflow, you can customize how you view and triage notifications.'
44
redirect_from:
5-
- /articles/managing-notifications/
5+
- /articles/managing-notifications
66
- /articles/managing-your-notifications
77
- /github/managing-subscriptions-and-notifications-on-github/viewing-and-triaging-notifications
88
versions:

content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-profile.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: About your profile
33
intro: 'Your profile page tells people the story of your work through the repositories you''re interested in, the contributions you''ve made, and the conversations you''ve had.'
44
redirect_from:
5-
- /articles/viewing-your-feeds/
6-
- /articles/profile-pages/
5+
- /articles/viewing-your-feeds
6+
- /articles/profile-pages
77
- /articles/about-your-profile
88
- /github/setting-up-and-managing-your-github-profile/about-your-profile
99
- /github/setting-up-and-managing-your-github-profile/customizing-your-profile/about-your-profile

content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
title: Personalizing your profile
33
intro: 'You can share information about yourself with other {% data variables.product.product_name %} users by setting a profile picture and adding a bio to your profile.'
44
redirect_from:
5-
- /articles/adding-a-bio-to-your-profile/
6-
- /articles/setting-your-profile-picture/
7-
- /articles/how-do-i-set-up-my-profile-picture/
8-
- /articles/gravatar-problems/
9-
- /articles/how-do-i-set-up-my-avatar/
5+
- /articles/adding-a-bio-to-your-profile
6+
- /articles/setting-your-profile-picture
7+
- /articles/how-do-i-set-up-my-profile-picture
8+
- /articles/gravatar-problems
9+
- /articles/how-do-i-set-up-my-avatar
1010
- /articles/personalizing-your-profile
1111
- /github/setting-up-and-managing-your-github-profile/personalizing-your-profile
1212
- /github/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile

content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/pinning-items-to-your-profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Pinning items to your profile
33
intro: You can pin gists and repositories to your profile so other people can quickly see your best work.
44
redirect_from:
5-
- /articles/pinning-repositories-to-your-profile/
5+
- /articles/pinning-repositories-to-your-profile
66
- /articles/pinning-items-to-your-profile
77
- /github/setting-up-and-managing-your-github-profile/pinning-items-to-your-profile
88
- /github/setting-up-and-managing-your-github-profile/customizing-your-profile/pinning-items-to-your-profile

0 commit comments

Comments
 (0)