Merge branch 'main' into 3634-dependabot-combined-notification

Author: mchammer01

.github/workflows/repo-freeze-check.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Fail if repo merges are paused
-        if: ${{ env.FREEZE == 'true' }}
+        if: ${{ env.FREEZE == 'true' && github.ref != 'refs/heads/repo-sync' }}
         run: |
           echo 'Merges into the "main" branch on this repo are currently paused!'
           exit 1

.github/workflows/repo-sync-stalls.yml

@@ -5,20 +5,7 @@ on:
   schedule:
     - cron: '0 */2 * * *'
 
-env:
-  FREEZE: ${{ secrets.FREEZE }}
-
 jobs:
-  check-freezer:
-    name: Check for deployment freezes
-    runs-on: ubuntu-latest
-    steps:
-      - name: Exit if repo is frozen
-        if: ${{ env.FREEZE == 'true' }}
-        run: |
-          echo 'The repo is currently frozen! Exiting this workflow.'
-          exit 1 # prevents further steps from running
-
   repo-sync-stalls:
     runs-on: ubuntu-latest
     steps:
@@ -60,7 +47,7 @@ jobs:
             })
       - name: Send Slack notification if workflow fails
         uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd
-        if: ${{ failure() && env.FREEZE != 'true' }}
+        if: ${{ failure() }}
         with:
           channel: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
           bot-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}

.github/workflows/repo-sync.yml

@@ -11,24 +11,10 @@ on:
   schedule:
     - cron: '*/15 * * * *' # every 15 minutes
 
-env:
-  FREEZE: ${{ secrets.FREEZE }}
-
 jobs:
-  check-freezer:
-    name: Check for deployment freezes
-    runs-on: ubuntu-latest
-    steps:
-      - name: Exit if repo is frozen
-        if: ${{ env.FREEZE == 'true' }}
-        run: |
-          echo 'The repo is currently frozen! Exiting this workflow.'
-          exit 1 # prevents further steps from running
-
   repo-sync:
     if: github.repository == 'github/docs-internal' || github.repository == 'github/docs'
     name: Repo Sync
-    needs: check-freezer
     runs-on: ubuntu-latest
     steps:
       - name: Check out repo

data/graphql/ghae/schema.docs-ghae.graphql

@@ -37067,7 +37067,7 @@ type VerifiableDomain implements Node {
   id: ID!
 
   """
-  Whether this domain is required to exist for an organization policy to be enforced.
+  Whether this domain is required to exist for an organization or enterprise policy to be enforced.
   """
   isRequiredForPolicyEnforcement: Boolean!
 

data/graphql/schema.docs.graphql

@@ -40380,7 +40380,7 @@ type VerifiableDomain implements Node {
   id: ID!
 
   """
-  Whether this domain is required to exist for an organization policy to be enforced.
+  Whether this domain is required to exist for an organization or enterprise policy to be enforced.
   """
   isRequiredForPolicyEnforcement: Boolean!
 

lib/graphql/static/prerendered-objects.json

@@ -55978,7 +55978,7 @@
         },
         {
           "name": "isRequiredForPolicyEnforcement",
-          "description": "<p>Whether this domain is required to exist for an organization policy to be enforced.</p>",
+          "description": "<p>Whether this domain is required to exist for an organization or enterprise policy to be enforced.</p>",
           "type": "Boolean!",
           "id": "boolean",
           "kind": "scalars",

lib/graphql/static/schema-dotcom.json

@@ -51817,7 +51817,7 @@
         },
         {
           "name": "isRequiredForPolicyEnforcement",
-          "description": "<p>Whether this domain is required to exist for an organization policy to be enforced.</p>",
+          "description": "<p>Whether this domain is required to exist for an organization or enterprise policy to be enforced.</p>",
           "type": "Boolean!",
           "id": "boolean",
           "kind": "scalars",