Skip to content

Commit 9d97467

Browse files
authored
Merge pull request #33108 from github/repo-sync
Repo sync
2 parents 57b497c + 430ec53 commit 9d97467

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

.github/workflows/first-responder-v2-prs-collect.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,19 @@ jobs:
4444
console.log(`This pull request was authored by an external contributor.`)
4545
return 'false'
4646
47+
# Check if docs-bot authored the PR
48+
# If yes, set Type field to "Maintenance"
49+
# If no, set Type field to "External contributor PR"
50+
- name: Check if docs-bot is PR author
51+
env:
52+
PR_AUTHOR_ID: ${{ github.event.pull_request.user.id }}
53+
run: |
54+
if [ $PR_AUTHOR_ID == 77750099 ]; then
55+
echo "TYPE_FIELD_VALUE=3f142cf2" >> $GITHUB_ENV
56+
else
57+
echo "TYPE_FIELD_VALUE=bbd0922a" >> $GITHUB_ENV
58+
fi
59+
4760
- name: Add the docs-content-fr label
4861
if: ${{ steps.check-membership.outputs.result == 'false' }}
4962
env:
@@ -53,7 +66,7 @@ jobs:
5366
gh pr edit $PR_URL --add-label docs-content-fr
5467
5568
# Add to the FR project
56-
# and set type to "External contributor PR"
69+
# and set type to "Maintenance" or "External contributor PR"
5770
# and set date to now
5871
- name: Triage to docs-content FR project
5972
if: steps.check-membership.outputs.result == 'false'
@@ -64,15 +77,14 @@ jobs:
6477
PROJECT_ID: PVT_kwDNJr_OAGNkBg
6578
TYPE_FIELD_ID: PVTSSF_lADNJr_OAGNkBs4D-Nyn
6679
DATE_FIELD_ID: PVTF_lADNJr_OAGNkBs4D-N1h
67-
EXTERNAL_PR_TYPE_ID: bbd0922a
6880
run: |
6981
echo "Adding item to project..."
7082
7183
ITEM_ID=$(gh project item-add $PROJECT_NUMBER --owner github --url $PR_URL --format json | jq .id)
7284
7385
echo "Editing type..."
7486
75-
gh project item-edit --project-id $PROJECT_ID --id $ITEM_ID --field-id $TYPE_FIELD_ID --single-select-option-id $EXTERNAL_PR_TYPE_ID
87+
gh project item-edit --project-id $PROJECT_ID --id $ITEM_ID --field-id $TYPE_FIELD_ID --single-select-option-id ${{ env.TYPE_FIELD_VALUE }}
7688
7789
echo "Editing date..."
7890

content/site-policy/acceptable-use-policies/github-misinformation-and-disinformation.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@ redirect_from:
1212
---
1313

1414
You may not post content that presents a distorted view of reality, whether it is inaccurate or false (misinformation) or is intentionally deceptive (disinformation), where such content is likely to result in harm to the public or to interfere with fair and equal opportunities for all to take part in a free and open society. This may include:
15-
- Inaccurate or scientifically unsupported medical claims that endanger public health or safety
15+
- Inaccurate or scientifically unsupported medical claims that endanger public health or safety
1616
- Manipulated media, whether audio or visual, likely to mislead or deceive in a way that may harm the public interest
1717
- False or misleading content likely to interfere with an individual's ability to participate in civic activities
1818
- Unsubstantiated claims that could promote hate or targeted harassment of specific groups of people
1919

2020
We encourage active participation in the expression of ideas, perspectives, and experiences and may not be in a position to dispute personal accounts or observations. We generally allow parody and satire that is in line with our [Acceptable Use Polices](/site-policy/acceptable-use-policies/github-acceptable-use-policies), and we consider context to be important in how information is received and understood. When reviewing content under this policy, GitHub will consider the impact of various factors that may help to orient the viewer, such as whether the content has been provided with clear disclaimers, citations to credible sources, or includes other details that clarify the accuracy of the information being shared.
21+
22+
## Synthetic & Manipulated Media Tools
23+
24+
GitHub does not allow any projects that are designed for, encourage, promote, support, or suggest in any way the use of synthetic or manipulated media for the creation of non-consensual intimate imagery or any content that would constitute misinformation or disinformation under this policy.

src/languages/components/LanguagePicker.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@ export const LanguagePicker = ({ xs, mediumOrLower }: Props) => {
9898
</>
9999
) : mediumOrLower ? (
100100
<ActionList className="hide-sm" selectionVariant="single">
101-
<ActionList.Group title={t('language_picker_label')}>{languageList}</ActionList.Group>
101+
<ActionList.Group>
102+
<ActionList.GroupHeading>{t('language_picker_label')}</ActionList.GroupHeading>
103+
{languageList}
104+
</ActionList.Group>
102105
</ActionList>
103106
) : (
104107
<ActionMenu>

0 commit comments

Comments
 (0)