Skip to content

Commit 7592895

Browse files
BlackmistBlackmist
committed
merge conflict
2 parents d5d1dab + 9a1cb30 commit 7592895

File tree

2,289 files changed

+39279
-64357
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,289 files changed

+39279
-64357
lines changed

‎.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["main" "release-.*"]
2-
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/|resource-graph/samples/))"]}
2+
:allowed-filename-matches ["articles"]}

‎.github/policies/disallow-edits.yml

Lines changed: 107 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,114 @@ configuration:
1010
- payloadType: Pull_Request
1111
- isAction:
1212
action: Opened
13-
- or:
14-
- filesMatchPattern:
15-
matchAny: true
16-
pattern: articles/index.*
13+
- filesMatchPattern:
14+
matchAny: true
15+
pattern: articles/index.*
1716
then:
1817
- addReply:
1918
reply: >-
20-
@${issueAuthor} - You tried to add an index file to this repository; this is not permitted so your pull request will be closed automatically.
19+
@${issueAuthor} - You tried to add an index file to this repository; this is not permitted so your pull request will be closed automatically.
2120
- closePullRequest
21+
22+
- description: Close PRs to the "ai-services/personalizer" and "ai-services/responsible-ai" folders where the author isn't a member of the MicrosoftDocs org (i.e. PRs in public repo).
23+
if:
24+
- payloadType: Pull_Request
25+
- isAction:
26+
action: Opened
27+
- or:
28+
- filesMatchPattern:
29+
matchAny: true
30+
pattern: articles/ai-services/personalizer/*
31+
- filesMatchPattern:
32+
matchAny: true
33+
pattern: articles/ai-services/responsible-ai/*
34+
- not:
35+
activitySenderHasAssociation:
36+
association: Member
37+
then:
38+
- addReply:
39+
reply: >-
40+
@${issueAuthor} - Pull requests that modify files in this folder aren't accepted from public contributors.
41+
- closePullRequest
42+
43+
- description: \@mention specific people when a PR is opened in the "ai-services/personalizer" folder.
44+
if:
45+
- payloadType: Pull_Request
46+
- isAction:
47+
action: Opened
48+
- filesMatchPattern:
49+
matchAny: true
50+
pattern: articles/ai-services/personalizer/*
51+
- activitySenderHasAssociation:
52+
association: Member
53+
- not:
54+
or:
55+
- isActivitySender:
56+
user: eric-urban
57+
- isActivitySender:
58+
user: nitinme
59+
- isActivitySender:
60+
user: mrbullwinkle
61+
then:
62+
- addReply:
63+
reply: >-
64+
@${issueAuthor} - Please don't sign off on this PR. The area owners will sign off once they've reviewed your contribution.
65+
- mentionUsers:
66+
mentionees:
67+
- eric-urban
68+
- nitinme
69+
- mrbullwinkle
70+
replyTemplate: ${mentionees} - Please review this PR and sign off when you're ready to merge it.
71+
assignMentionees: True # This part probably won't work since the bot doesn't have write perms.
72+
- addLabel:
73+
label: needs-human-review
74+
75+
- description: \@mention specific people when a PR is opened in the "ai-services/responsible-ai" folder.
76+
if:
77+
- payloadType: Pull_Request
78+
- isAction:
79+
action: Opened
80+
- filesMatchPattern:
81+
matchAny: true
82+
pattern: articles/ai-services/responsible-ai/*
83+
- activitySenderHasAssociation:
84+
association: Member
85+
- not:
86+
or:
87+
- isActivitySender:
88+
user: eric-urban
89+
- isActivitySender:
90+
user: nitinme
91+
- isActivitySender:
92+
user: mrbullwinkle
93+
- isActivitySender:
94+
user: aahill
95+
- isActivitySender:
96+
user: laujan
97+
- isActivitySender:
98+
user: patrickfarley
99+
- isActivitySender:
100+
user: jboback
101+
- isActivitySender:
102+
user: heidisteen
103+
- isActivitySender:
104+
user: haileytap
105+
then:
106+
- addReply:
107+
reply: >-
108+
@${issueAuthor} - Please don't sign off on this PR. The area owners will sign off once they've reviewed your contribution.
109+
- mentionUsers:
110+
mentionees:
111+
- eric-urban
112+
- nitinme
113+
- mrbullwinkle
114+
- aahill
115+
- laujan
116+
- patrickfarley
117+
- jboback
118+
- heidisteen
119+
- haileytap
120+
replyTemplate: ${mentionees} - Please review this PR and sign off when you're ready to merge it.
121+
assignMentionees: True # This part probably won't work since the bot doesn't have write perms.
122+
- addLabel:
123+
label: needs-human-review

‎.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ _site/
99
_themes*/
1010
_repo.*/
1111

12-
.openpublishing.buildcore.ps1
12+
.openpublishing.buildcore.ps1
13+
14+
# CoPilot instructions and prompts
15+
.github/copilot-instructions.md
16+
.github/prompts/*.md

‎.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,16 @@
259259
"source_path_from_root": "/articles/open-datasets/dataset-genomics-data-lake.md",
260260
"redirect_url": "/azure/open-datasets/dataset-catalog",
261261
"redirect_document_id": false
262+
},
263+
{
264+
"source_path_from_root": "/articles/ai-services/openai/concepts/provisioned-reservation-update.md",
265+
"redirect_url": "/azure/ai-services/openai/concepts/provisioned-migration",
266+
"redirect_document_id": true
267+
},
268+
{
269+
"source_path_from_root": "/articles/ai-services/custom-vision-service/logo-detector-mobile.md",
270+
"redirect_url": "/azure/ai-services/custom-vision-service",
271+
"redirect_document_id": false
262272
}
263273
]
264274
}

‎.whatsnew.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99
"navigationOptions": {
1010
"maximumNumberOfArticles": 5,
1111
"tocParentNode": "Latest documentation updates",
12-
"repoTocFolder": "articles/ai-services",
12+
"repoTocFolder": "articles/whats-new",
1313
"indexParentNode": "Latest documentation updates",
14-
"repoIndexFolder": "articles/ai-services"
14+
"repoIndexFolder": "articles/whats-new"
1515
},
1616
"areas": [
1717
{
1818
"names": [ "ai-services" ],
1919
"heading": "Azure AI Services"
2020
},
2121
{
22-
"names": [ "ai-studio" ],
23-
"heading": "Azure AI Foundry"
22+
"names": [ "ai-foundry" ],
23+
"heading": "Azure Foundry"
2424
},
2525
{
2626
"names": [ "machine-learning" ],
27-
"heading": "Azure Machine Learning"
27+
"heading": "Machine Learning"
2828
},
2929
{
3030
"names": [ "search" ],

0 commit comments

Comments
 (0)