merge conflicts

Author: gitName

.github/policies/disallow-edits.yml

@@ -10,7 +10,7 @@ configuration:
           - payloadType: Pull_Request
           - isAction:
               action: Opened
-          - or:              
+          - or:
               - filesMatchPattern:
                   matchAny: true
                   pattern: articles/aks/*
@@ -121,4 +121,74 @@ configuration:
               reply: >-
                 @${issueAuthor} - You tried to add content to a folder path that has been removed from this repository. Your pull request will be automatically closed. Submit your changes to the updated repository, which can be identified by clicking the Edit this Document link at the top of any published article for that product or service.
           - closePullRequest
+
+      - description: Alert authors to edits in the /articles/reliability folder.
+        if:
+          # If a PR in the articles/reliability folder is opened, and the PR author isn't Anastasia or John...
+          - payloadType: Pull_Request
+          - filesMatchPattern:
+              matchAny: true
+              pattern: articles/reliability/*
+          - isAction:
+              action: Opened
+          - not:
+              or:
+                - isActivitySender:
+                    user: anaharris-ms
+                - isActivitySender:
+                    user: johndowns
+        then:
+          # Mention Anastasia and John, add a reply asking the PR author not to sign off on the PR, and add the needs-human-review label.
+          - mentionUsers:
+              mentionees:
+                - anaharris-ms
+                - johndowns
+              replyTemplate: >-
+                Tagging authors for this folder: ${mentionees}
+          - addReply:
+              reply: >-
+                @${issueAuthor} - Please do NOT sign off on this pull request. The Reliability Hub owners will sign off for you.
+          - addLabel:
+              label: needs-human-review
+
+      - description: Disallow sign-off for articles in the /articles/reliability folder.
+        if:
+          # If a 'sign-off' comment is added to a PR in the articles/reliability folder , and the PR author isn't Anastasia or John...
+          - payloadType: Issue_Comment
+          - isPullRequest
+          - filesMatchPattern:
+              matchAny: true
+              pattern: articles/reliability/*
+          - commentContains:
+              pattern: \#sign-off
+              isRegex: false
+          - not:
+              or:
+                - isActivitySender:
+                    user: anaharris-ms
+                - isActivitySender:
+                    user: johndowns
+        then:
+          # Add the do-not-merge label, remove the ready-to-merge label, and add a reply asking the PR author not to sign off on the PR.
+          - addReply:
+              reply: >-
+                @${issueAuthor} - Please do NOT sign off on this pull request. The Reliability Hub owners will sign off for you.
+          - addLabel:
+              label: do-not-merge
+          - removeLabel:
+              label: ready-to-merge
+      
+      - description: Write a message if the breadcrumb file is modified in the azure-docs-pr repository.
+        if:
+        - payloadType: Pull_Request
+        - isAction:
+            action: Opened
+        - filesMatchPattern:
+              matchAny: true
+              pattern: bread/*
+              
+        then:
+          - addReply:
+              reply: >-
+                @${issueAuthor} - This PR modifies the breadcrumb file for the entire repository: bread/toc.yml. This file supports the on-site navigation for 100s of services. Please make sure your changes to the breadcrumb file are intentional. Do not delete this file. 
           

.github/workflows/stale.yml

@@ -27,11 +27,14 @@ jobs:
         # start-date: '2021-03-19'
         stale-pr-message: >
           This pull request has been inactive for at least 14 days.
-          If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.learn.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation?branch=main) for instructions.
-                    
-          [Get Help](https://review.learn.microsoft.com/help/contribute/help-options?branch=main)  
+
+          If you are finished with your changes, don't forget to sign off. See the [platform guide](https://review.learn.microsoft.com/help/platform/prmerger-hashtag-commands?branch=main) for instructions.
+             
+          [Get Help](https://review.learn.microsoft.com/help/platform/help-options?branch=main)  
           
-          [Docs Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)  
+          [Learn Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)  
           
-          [Resolve Merge Conflict](https://review.learn.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)  
-        
+          [Resolve Merge Conflicts](https://review.learn.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)  
+        close-pr-message: >
+          This pull request has been inactive for 90 days, and an `auto-close` label has been added. At this time, the system is closing the PR automatically. If you decide to continue working on your changes, scroll to the bottom of the pull request comments and select the **Reopen pull request** button.
+          <br/>

.openpublishing.build.ps1

@@ -128,12 +128,6 @@
             "branch": "master",
             "branch_mapping": {}
         },
-        {
-            "path_to_root": "azure-docs-snippets-pr",
-            "url": "https://github.com/MicrosoftDocs/azure-docs-snippets-pr",
-            "branch": "main",
-            "branch_mapping": {}
-        },
         {
             "path_to_root": "azure-functions-dapr-extension",
             "url": "https://github.com/Azure/azure-functions-dapr-extension",
@@ -590,6 +584,12 @@
             "branch": "main",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "msdocs-jboss-mysql-sample-app",
+            "url": "https://github.com/Azure-Samples/msdocs-jboss-mysql-sample-app",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "playwright-testing-service",
             "url": "https://github.com/microsoft/playwright-testing-service",