Skip to content

Commit f6da67b

Browse files
authored
Merge branch 'main' into patch-2
2 parents 9b51958 + aa25b5b commit f6da67b

File tree

2,550 files changed

+10637
-8720
lines changed

Some content is hidden

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

2,550 files changed

+10637
-8720
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{:changed-files-limit 60
22
:allowed-branchname-matches ["main" "release-.*"]
3-
:allowed-filename-matches ["ATADocs/" "ATPDocs/" "CloudAppSecurityDocs/" "defender/" "defender-business/" "defender-endpoint/" "defender-for-cloud/" "defender-for-iot/" "defender-office-365/" "defender-vulnerability-management/" "defender-xdr/" "exposure-management/" "unified-secops-platform/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
3+
:allowed-filename-matches ["advanced-threat-analytics/" "defender/" "defender-business/" "defender-endpoint/" "defender-for-cloud-apps/" "defender-for-cloud/" "defender-for-identity/" "defender-for-iot/" "defender-office-365/" "defender-vulnerability-management/" "defender-xdr/" "exposure-management/" "unified-secops-platform/"] ;; Can be overridden in repo-specific edn file. This is an allow list that identifies which folders contain the files Acrolinx will check. Separate multiple folders as follows ["folder/" "folder2"]
44

55
:use-gh-statuses true
66

.github/workflows/AutoLabelAssign.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,11 @@ jobs:
3030
with:
3131
PayloadJson: ${{ needs.download-payload.outputs.WorkflowPayload }}
3232
AutoAssignUsers: 1
33+
AutoAssignReviewers: 1
3334
AutoLabel: 1
3435
ExcludedUserList: '["user1", "user2"]'
3536
ExcludedBranchList: '["branch1", "branch2"]'
3637
secrets:
37-
AccessToken: ${{ secrets.GITHUB_TOKEN }}
38+
AccessToken: ${{ secrets.GITHUB_TOKEN }}
39+
PrivateKey: ${{ secrets.M365_APP_PRIVATE_KEY }}
40+
ClientId: ${{ secrets.M365_APP_CLIENT_ID }}

.github/workflows/BackgroundTasks.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ permissions:
66

77
on:
88
pull_request_target:
9+
types: [opened, synchronize, reopened, ready_for_review]
910

1011
jobs:
1112
upload:

.openpublishing.publish.config.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"docsets_to_publish": [
33
{
44
"docset_name": "ATA-Docs",
5-
"build_source_folder": "ATADocs",
5+
"build_source_folder": "advanced-threat-analytics",
66
"build_output_subfolder": "ATA-Docs",
77
"locale": "en-us",
88
"monikers": [],
@@ -14,7 +14,7 @@
1414
},
1515
{
1616
"docset_name": "ATP-Docs",
17-
"build_source_folder": "ATPDocs",
17+
"build_source_folder": "defender-for-identity",
1818
"build_output_subfolder": "ATP-Docs",
1919
"locale": "en-us",
2020
"monikers": [],
@@ -51,7 +51,7 @@
5151
},
5252
{
5353
"docset_name": "defender-cloud-apps",
54-
"build_source_folder": "CloudAppSecurityDocs",
54+
"build_source_folder": "defender-for-cloud-apps",
5555
"build_output_subfolder": "defender-cloud-apps",
5656
"locale": "en-us",
5757
"monikers": [],
@@ -185,11 +185,12 @@
185185
"branch_target_mapping": {},
186186
"targets": {},
187187
"redirection_files": [
188-
".openpublishing.redirection.ata-atp.json",
188+
".openpublishing.redirection.ata.json",
189189
".openpublishing.redirection.defender.json",
190190
".openpublishing.redirection-defender-business.json",
191191
".openpublishing.redirection.defender-cloud-apps.json",
192192
".openpublishing.redirection.defender-endpoint.json",
193+
".openpublishing.redirection.defender-identity.json",
193194
".openpublishing.redirection.defender-office-365.json",
194195
".openpublishing.redirection.defender-xdr.json",
195196
".openpublishing.redirection.unified-secops.json"

0 commit comments

Comments
 (0)