Merge branch 'main' into patch-1

.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

.github/workflows/triage-stale-check.yml

@@ -28,6 +28,7 @@ jobs:
           days-before-pr-stale: 14
           days-before-pr-close: -1 # Never close
           remove-stale-when-updated: false
+          operations-per-run: 100
           only-labels: 'waiting for review'
           # The hope is that by setting the stale-pr-label to the same label
           # as the label that the stale check looks for, this will result in

content/actions/hosting-your-own-runners/about-self-hosted-runners.md

@@ -49,7 +49,7 @@ For more information about installing and using self-hosted runners, see "[Addin
 
 You can use any machine as a self-hosted runner as long at it meets these requirements:
 
-* You can install and run the self-hosted runner application on the machine. For more information, see "[Supported operating systems for self-hosted runners](#supported-operating-systems-for-self-hosted-runners)."
+* You can install and run the self-hosted runner application on the machine. For more information, see "[Supported architectures and operating systems for self-hosted runners](#supported-architectures-and-operating-systems-for-self-hosted-runners)."
 * The machine can communicate with {% data variables.product.prodname_actions %}. For more information, see "[Communication between self-hosted runners and {% data variables.product.prodname_dotcom %}](#communication-between-self-hosted-runners-and-github)."
 * The machine has enough hardware resources for the type of workflows you plan to run. The self-hosted runner application itself only requires minimal resources.
 * If you want to run workflows that use Docker container actions or service containers, you must use a Linux machine and Docker must be installed.

content/actions/reference/events-that-trigger-workflows.md

@@ -41,6 +41,12 @@ The following steps occur to trigger a workflow run:
 
 The `schedule` event allows you to trigger a workflow at a scheduled time.
 
+{% note %}
+
+Note: Due to load, the `schedule` event may be delayed 
+
+{% endnote %}
+
 #### `schedule`
 
 | Webhook event payload | Activity types | `GITHUB_SHA` | `GITHUB_REF` |

content/github/managing-your-work-on-github/assigning-issues-and-pull-requests-to-other-github-users.md

@@ -11,13 +11,29 @@ versions:
 
 Anyone with write permissions to a repository can assign issues and pull requests.
 
+### About issue and pull request assignees
+
 You can assign up to 10 people to each issue or pull request, including yourself, anyone who has commented on the issue or pull request, anyone with write permissions to the repository, and organization members with read permissions to the repository. For more information, see "[Access permissions on {% data variables.product.prodname_dotcom %}](/articles/access-permissions-on-github)."
 
+### Assigning an individual issue or pull request
+
+{% data reusables.repositories.navigate-to-repo %}
+{% data reusables.repositories.sidebar-issue-pr %}
+3. Open the issue or pull request that you want to assign to someone.
+4. If no one is assigned to an issue or pull request, click **assign yourself** to assign yourself.
+  ![The assign yourself item](/assets/images/help/issues/assign_yourself.png)
+5. In the right side menu, click **Assignees**.
+   ![The Assignees menu item](/assets/images/help/issues/assignee_menu.png)
+6. To assign the issue or pull request to a user, start typing their username, then click their name when it appears. You can select and add up to ten assignees to an issue or pull request.
+  ![Issues assignment drop-down](/assets/images/help/issues/issues_assigning_dropdown.png)
+
+### Assigning multiple issues or pull requests
+
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-issue-pr %}
 3. Select the checkbox next to the items you want to assign to someone.
   ![Issues metadata checkbox](/assets/images/help/issues/issues_assign_checkbox.png)
-4. In the upper-right corner, click **Assignee**.
+4. In the upper-right corner, click **Assign**.
 5. To assign the items to a user, start typing their username, then click their name when it appears. You can select and add up to ten assignees to an issue or pull request.
   ![Issues assignment drop-down](/assets/images/help/issues/issues_assigning_dropdown.png)
 

content/github/site-policy/github-additional-product-terms.md

@@ -4,7 +4,7 @@ versions:
   free-pro-team: '*'
 ---
 
-Version Effective Date: December 14, 2020
+Version Effective Date: February 22, 2021
 
 When you create an Account, you're given access to lots of different features and products that are all a part of the Service. Because many of these features and products offer different functionality, they may require additional terms and conditions specific to that feature or product. Below, we've listed those features and products, along with the corresponding additional terms that apply to your use of them.
 
@@ -39,9 +39,24 @@ If you enable Git Large File Storage ("Git LFS") on your Account, you'll be able
 
 ### 4. Pages
 
-Each Account comes with access to the [GitHub Pages static hosting service](/github/working-with-github-pages/about-github-pages). This hosting service is intended to host static web pages for All Users, but primarily as a showcase for personal and organizational projects. Some monetization efforts are permitted on Pages, such as donation buttons and crowdfunding links.
+Each Account comes with access to the [GitHub Pages static hosting service](/github/working-with-github-pages/about-github-pages). This hosting service is intended to host static web pages for All Users, but primarily as a showcase for personal and organizational projects. 
 
-GitHub Pages are subject to some specific bandwidth and usage limits, and may not be appropriate for some high-bandwidth uses or other prohibited uses. Please see our [GitHub Pages guidelines](/github/working-with-github-pages/about-github-pages) for more information. GitHub reserves the right at all times to reclaim any GitHub subdomain without liability.
+GitHub Pages is not intended for or allowed to be used as a free web hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS). Some monetization efforts are permitted on Pages, such as donation buttons and crowdfunding links. 
+
+#### a. Bandwidth and Usage Limits
+GitHub Pages are subject to some specific bandwidth and usage limits, and may not be appropriate for some high-bandwidth uses. Please see our [GitHub Pages guidelines](/github/working-with-github-pages/about-github-pages) for more information. 
+
+#### b. Prohibited Uses
+Prohibited uses of GitHub Pages include
+- Content or activity that is illegal or otherwise prohibited by our [Terms of Service](/github/site-policy/github-terms-of-service), [Acceptable Use Policies](/github/site-policy/github-acceptable-use-policies) or [Community Guidelines](/github/site-policy/github-community-guidelines)
+- Violent or threatening content or activity
+- Excessive automated bulk activity (for example, spamming)
+- Activity that compromises GitHub users or GitHub services
+- Get-rich-quick schemes
+- Sexually obscene content
+- Content that misrepresents your identity or site purpose
+
+If you have questions about whether your use or intended use falls into these categories, please contact [GitHub Support](https://support.github.com/contact) or [GitHub Premium Support](https://premium.githubsupport.com/). GitHub reserves the right at all times to reclaim any GitHub subdomain without liability.
 
 ### 5. Actions and Packages
 

content/github/working-with-github-pages/about-github-pages.md

@@ -132,17 +132,7 @@ If your site exceeds these usage quotas, we may not be able to serve your site,
 
 {% data variables.product.prodname_pages %} is not intended for or allowed to be used as a free web hosting service to run your online business, e-commerce site, or any other website that is primarily directed at either facilitating commercial transactions or providing commercial software as a service (SaaS).
 
-Additionally, {% data variables.product.prodname_pages %} sites must refrain from:
-
-  - Content or activity that is illegal or otherwise prohibited by our [Terms of Service](/articles/github-terms-of-service/) or [Community Guidelines](/articles/github-community-guidelines/)
-  - Violent or threatening content or activity
-  - Excessive automated bulk activity (for example, spamming)
-  - Activity that compromises GitHub users or GitHub services
-  - Get-rich-quick schemes
-  - Sexually obscene content
-  - Content that misrepresents your identity or site purpose
-
-If you have questions about whether your use or intended use falls into these categories, please contact {% data variables.contact.contact_support %}.
+In addition, {% data variables.product.prodname_dotcom %} does not allow {% data variables.product.prodname_pages %} to be used for certain purposes or activities. For a list of prohibited uses, see "[{% data variables.product.prodname_dotcom %}'s Additional Product Terms for {% data variables.product.prodname_pages %}](/github/site-policy/github-additional-product-terms#4-pages)."
 {% endif %}
 
 ### MIME types on {% data variables.product.prodname_pages %}

content/github/working-with-github-pages/managing-a-custom-domain-for-your-github-pages-site.md

@@ -35,7 +35,7 @@ The `dig` command, which can be used to verify correct configuration of DNS reco
 
 ### Configuring a subdomain
 
-To set up a `www` or custom subdomain, such as `www.example.com` or `blog.example.com`, you must create a _CNAME_ file in your site's repository and configure a `CNAME` record with your DNS provider.
+To set up a `www` or custom subdomain, such as `www.example.com` or `blog.example.com`, you must add your domain in the repository settings, which will create a CNAME file in your site’s repository. After that, configure a CNAME record with your DNS provider.
 
 {% data reusables.pages.navigate-site-repo %}
 {% data reusables.repositories.sidebar-settings %}

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!
 

javascripts/experiment.js

@@ -1,8 +1,6 @@
 import murmur from 'imurmurhash'
 import { getUserEventsId, sendEvent } from './events'
-import h from './hyperscript'
-
-import { updateDisplay, submitForm } from './helpfulness'
+// import h from './hyperscript'
 
 const TREATMENT = 'TREATMENT'
 const CONTROL = 'CONTROL'
@@ -29,79 +27,4 @@ export default function () {
   // const x = document.querySelector(...)
   // x.addEventListener('click', () => { sendSuccess(testName) })
   // if (xbucket === TREATMENT) applyTreatment(x)
-
-  const testName = 'survey-stars'
-  const xbucket = bucket(testName)
-
-  const form = document.querySelector('.js-helpfulness')
-  if (!form) return
-
-  // Overwrites the default handler for helpfulness survey...
-  form.addEventListener('submit', evt => {
-    evt.preventDefault()
-    sendSuccess(testName)
-    submitForm(form)
-    updateDisplay(form, 'end')
-  })
-
-  if (xbucket === TREATMENT) applyTreatment(form)
-}
-
-function applyTreatment (form) {
-  const p = form.querySelector('.radio-group')
-  p.innerHTML = ''
-
-  const buttons = [1, 2, 3, 4, 5].map(i =>
-    h(
-      'button',
-      {
-        'data-value': i,
-        'aria-label': i,
-        class: 'btn-link tooltipped tooltipped-n'
-      },
-      h(
-        'span',
-        {
-          class: 'star-empty f3'
-        },
-        '☆'
-      ),
-      h(
-        'span',
-        {
-          class: 'star-full f3',
-          hidden: true
-        },
-        '★'
-      )
-    )
-  )
-  const input = h('input', {
-    name: 'helpfulness-vote',
-    type: 'hidden'
-  })
-  buttons.forEach(btn => p.appendChild(btn))
-  p.appendChild(input)
-
-  buttons.forEach((btn, i) => {
-    btn.addEventListener('click', evt => {
-      evt.preventDefault()
-      updateBtnDisplay(i)
-      submitForm(form)
-      updateDisplay(form, i > 2 ? 'yes' : 'no')
-    })
-  })
-
-  function updateBtnDisplay (i) {
-    buttons.forEach((xbtn, xi) => {
-      if (xi <= i) {
-        xbtn.querySelector('.star-full').removeAttribute('hidden')
-        xbtn.querySelector('.star-empty').setAttribute('hidden', true)
-      } else {
-        xbtn.querySelector('.star-full').setAttribute('hidden', true)
-        xbtn.querySelector('.star-empty').removeAttribute('hidden')
-      }
-    })
-    input.setAttribute('value', i > 2 ? 'Yes' : 'No')
-  }
 }

javascripts/helpfulness.js

@@ -8,7 +8,7 @@ function hideElement (el) {
   el.setAttribute('hidden', true)
 }
 
-export function updateDisplay (form, state) {
+function updateDisplay (form, state) {
   Array.from(
     form.querySelectorAll(
       ['start', 'yes', 'no', 'end']
@@ -21,7 +21,7 @@ export function updateDisplay (form, state) {
     .forEach(showElement)
 }
 
-export function submitForm (form) {
+function submitForm (form) {
   const formData = new FormData(form)
   const data = Object.fromEntries(
     Array.from(formData.entries())

lib/graphql/static/schema-dotcom.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-ghae.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",

lib/redirects/get-old-paths-from-permalink.js

@@ -53,10 +53,6 @@ module.exports = function getOldPathsFromPath (currentPath, languageCode, curren
       .replace('/user/', '/'))
   }
 
-  // create old path /enterprise/foo from current path /enterprise/latest/user/foo
-  oldPaths.add(currentPath
-    .replace(`/enterprise/${latest}/user/`, '/enterprise/'))
-
   // ------ END LEGACY VERSION FORMAT REPLACEMENTS ------//
 
   // ------ BEGIN MODERN VERSION FORMAT REPLACEMENTS ------//

tests/browser/browser.js

@@ -85,7 +85,7 @@ describe('browser search', () => {
   })
 })
 
-describe.skip('helpfulness', () => {
+describe('helpfulness', () => {
   it('sends an event to /events when submitting form', async () => {
     // Visit a page that displays the prompt
     await page.goto('http://localhost:4001/en/actions/getting-started-with-github-actions/about-github-actions')