Skip to content

Commit 98bc755

Browse files
nataliekagolenataliekagole
authored
Merge branch 'main' into Natalie-working-branch
2 parents 0e31e9a + ec6c6d5 commit 98bc755

852 files changed

Lines changed: 8252 additions & 6582 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/AutoLabelAssign.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Assign and label PR
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
actions: read
7+
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
13+
14+
jobs:
15+
download-payload:
16+
name: Download and extract payload artifact
17+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
18+
with:
19+
WorkflowId: ${{ github.event.workflow_run.id }}
20+
OrgRepo: ${{ github.repository }}
21+
secrets:
22+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
23+
24+
label-assign:
25+
name: Run assign and label
26+
needs: [download-payload]
27+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelAssign.yml@workflows-prod
28+
with:
29+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
30+
AutoAssignUsers: 1
31+
AutoLabel: 1
32+
ExcludedUserList: '["user1", "user2"]'
33+
ExcludedBranchList: '["branch1", "branch2"]'
34+
secrets:
35+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
36+
37+
38+
39+
40+
41+

‎.github/workflows/AutoLabelMsftContributor.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Auto label Microsoft contributors
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
actions: read
7+
8+
on:
9+
workflow_run:
10+
workflows: [Background tasks]
11+
types:
12+
- completed
13+
14+
jobs:
15+
download-payload:
16+
if: github.repository_visibility == 'public'
17+
name: Download and extract payload artifact
18+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ExtractPayload.yml@workflows-prod
19+
with:
20+
WorkflowId: ${{ github.event.workflow_run.id }}
21+
OrgRepo: ${{ github.repository }}
22+
secrets:
23+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
24+
25+
label-msft:
26+
name: Label Microsoft contributors
27+
if: github.repository_visibility == 'public'
28+
needs: [download-payload]
29+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-AutoLabelMsftContributor.yml@workflows-prod
30+
with:
31+
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
32+
secrets:
33+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
34+
TeamReadAccessToken: ${{ secrets.ORG_READTEAMS_TOKEN }}
35+
36+
37+
38+
39+
40+

‎.github/workflows/BackgroundTasks.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Background tasks
2+
3+
permissions:
4+
pull-requests: write
5+
contents: read
6+
7+
on:
8+
pull_request_target:
9+
10+
jobs:
11+
upload:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Save payload data
16+
env:
17+
PayloadJson: ${{ toJSON(github) }}
18+
AccessToken: ${{ github.token }}
19+
run: |
20+
mkdir -p ./pr
21+
echo $PayloadJson > ./pr/PayloadJson.json
22+
sed -i -e "s/$AccessToken/XYZ/g" ./pr/PayloadJson.json
23+
- uses: actions/upload-artifact@v4
24+
with:
25+
name: PayloadJson
26+
path: pr/

‎.github/workflows/LiveMergeCheck.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: PR can merge into branch
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on:
9+
pull_request_target:
10+
types: [opened, reopened, synchronize, edited]
11+
12+
jobs:
13+
14+
live-merge:
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-LiveMergeCheck.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
secrets:
19+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
20+
21+
22+

‎.github/workflows/PrFileCount.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: PR file count less than limit
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on:
9+
pull_request_target:
10+
types: [opened, reopened, synchronize, labeled, unlabeled]
11+
12+
jobs:
13+
14+
file-count:
15+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-PrFileCount.yml@workflows-prod
16+
with:
17+
PayloadJson: ${{ toJSON(github) }}
18+
secrets:
19+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
20+
21+
22+

‎.github/workflows/ProtectedFiles.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: PR has no protected files
2+
3+
permissions:
4+
pull-requests: write
5+
statuses: write
6+
contents: read
7+
8+
on: [pull_request_target]
9+
10+
jobs:
11+
12+
protected-files:
13+
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-ProtectedFiles.yml@workflows-prod
14+
with:
15+
PayloadJson: ${{ toJSON(github) }}
16+
secrets:
17+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
18+
19+
20+

‎.openpublishing.redirection.enterprise.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,6 +1339,21 @@
13391339
"source_path": "microsoft-365/enterprise/disable-access-to-services-while-assigning-user-licenses.md",
13401340
"redirect_url": "/microsoft-365/enterprise/assign-licenses-to-user-accounts-with-microsoft-365-powershell",
13411341
"redirect_document_id": false
1342+
},
1343+
{
1344+
"source_path": "microsoft-365/enterprise/internet-sites-in-microsoft-azure-using-sharepoint-server-2013.md",
1345+
"redirect_url": "/microsoft-365/enterprise/index",
1346+
"redirect_document_id": false
1347+
},
1348+
{
1349+
"source_path": "microsoft-365/enterprise/microsoft-azure-architectures-for-sharepoint-2013.md",
1350+
"redirect_url": "/microsoft-365/enterprise/index",
1351+
"redirect_document_id": false
1352+
},
1353+
{
1354+
"source_path": "microsoft-365/enterprise/sharepoint-server-2013-disaster-recovery-in-microsoft-azure.md",
1355+
"redirect_url": "/microsoft-365/enterprise/index",
1356+
"redirect_document_id": false
13421357
}
13431358
]
13441359
}

‎.openpublishing.redirection.security.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4737,47 +4737,47 @@
47374737
},
47384738
{
47394739
"source_path": "Microsoft-365/security/office-365-security/zero-trust-continuous-access-evaluation-microsoft-365.md",
4740-
"redirect_url": "/defender-office-365/zero-trust-continuous-access-evaluation-microsoft-365",
4740+
"redirect_url": "/security/zero-trust/zero-trust-continuous-access-evaluation-microsoft-365",
47414741
"redirect_document_id": false
47424742
},
47434743
{
47444744
"source_path": "Microsoft-365/security/office-365-security/zero-trust-identity-device-access-policies-common.md",
4745-
"redirect_url": "/defender-office-365/zero-trust-identity-device-access-policies-common",
4745+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-common",
47464746
"redirect_document_id": false
47474747
},
47484748
{
47494749
"source_path": "Microsoft-365/security/office-365-security/zero-trust-identity-device-access-policies-exchange.md",
4750-
"redirect_url": "/defender-office-365/zero-trust-identity-device-access-policies-exchange",
4750+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-exchange",
47514751
"redirect_document_id": false
47524752
},
47534753
{
47544754
"source_path": "Microsoft-365/security/office-365-security/zero-trust-identity-device-access-policies-guest-access.md",
4755-
"redirect_url": "/defender-office-365/zero-trust-identity-device-access-policies-guest-access",
4755+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-guest-access",
47564756
"redirect_document_id": false
47574757
},
47584758
{
47594759
"source_path": "Microsoft-365/security/office-365-security/zero-trust-identity-device-access-policies-mcas-saas.md",
4760-
"redirect_url": "/defender-office-365/zero-trust-identity-device-access-policies-mcas-saas",
4760+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-mcas-saas",
47614761
"redirect_document_id": false
47624762
},
47634763
{
47644764
"source_path": "Microsoft-365/security/office-365-security/zero-trust-identity-device-access-policies-overview.md",
4765-
"redirect_url": "/defender-office-365/zero-trust-identity-device-access-policies-overview",
4765+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-overview",
47664766
"redirect_document_id": false
47674767
},
47684768
{
47694769
"source_path": "Microsoft-365/security/office-365-security/zero-trust-identity-device-access-policies-prereq.md",
4770-
"redirect_url": "/defender-office-365/zero-trust-identity-device-access-policies-prereq",
4770+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-prerequisite",
47714771
"redirect_document_id": false
47724772
},
47734773
{
47744774
"source_path": "Microsoft-365/security/office-365-security/zero-trust-identity-device-access-policies-sharepoint.md",
4775-
"redirect_url": "/defender-office-365/zero-trust-identity-device-access-policies-sharepoint",
4775+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-sharepoint",
47764776
"redirect_document_id": false
47774777
},
47784778
{
47794779
"source_path": "Microsoft-365/security/office-365-security/zero-trust-identity-device-access-policies-teams.md",
4780-
"redirect_url": "/defender-office-365/zero-trust-identity-device-access-policies-teams",
4780+
"redirect_url": "/security/zero-trust/zero-trust-identity-device-access-policies-teams",
47814781
"redirect_document_id": false
47824782
},
47834783
{

‎.openpublishing.redirection.syntex.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,12 @@
129129
"source_path":"microsoft-365/syntex/backup/backup-preview-terms.md",
130130
"redirect_url":"/microsoft-365/backup/backup-preview-terms",
131131
"redirect_document_id":true
132+
},
133+
{
134+
"source_path":"microsoft-365/backup/storage/backup-3p-pricing.md",
135+
"redirect_url":"/microsoft-365/backup/storage/backup-3p-billing",
136+
"redirect_document_id":true
132137
}
133-
138+
134139
]
135140
}

‎.openpublishing.redirection.viva.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"source_path": "microsoft-365/viva/setup-microsoft-viva.md",
1010
"redirect_url": "/viva/setup-microsoft-viva",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "microsoft-365/topics/viva-language-support.md",
15+
"redirect_url": "/viva/viva-language-support",
16+
"redirect_document_id": false
1217
}
1318
]
1419
}

0 commit comments

Comments
 (0)