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

Author: mchammer01

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

@@ -1,7 +1,8 @@
 name: Repo Freeze Check
 
 on:
-  pull_request:
+  workflow_dispatch:
+  pull_request_target:
     types:
       - opened
       - reopened

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

@@ -60,7 +60,7 @@ jobs:
             })
       - name: Send Slack notification if workflow fails
         uses: someimportantcompany/github-actions-slack-message@0b470c14b39da4260ed9e3f9a4f1298a74ccdefd
-        if: failure()
+        if: ${{ failure() && env.FREEZE != 'true' }}
         with:
           channel: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}
           bot-token: ${{ secrets.SLACK_DOCS_BOT_TOKEN }}

content/actions/managing-workflow-runs/adding-a-workflow-status-badge.md

@@ -12,52 +12,31 @@ versions:
 
 {% data reusables.repositories.actions-workflow-status-badge-into %}
 
-If your workflow uses the `name` keyword, you must reference the workflow by name. If the name of your workflow contains white space, you'll need to replace the space with the URL encoded string `%20`. For more information about the `name` keyword, see "[Workflow syntax for {% data variables.product.prodname_actions %}](/articles/workflow-syntax-for-github-actions#name)."
+You reference the workflow by the name of your workflow file.
 
 ```
-https://github.com/<OWNER>/<REPOSITORY>/workflows/<WORKFLOW_NAME>/badge.svg
+https://github.com/<OWNER>/<REPOSITORY>/actions/workflows/<WORKFLOW_FILE>/badge.svg
 ```
+### Using the workflow file name
 
-Alternatively, if your workflow doesn't have a `name`, you must reference the workflow file using the file path relative to the repository's root directory.
-
-{% note %}
-
-**Note:** Referencing the workflow file using the file path does not work if the workflow has a `name`.
-
-{% endnote %}
-
-```
-https://github.com/<OWNER>/<REPOSITORY>/workflows/<WORKFLOW_FILE_PATH>/badge.svg
-```
-
-### Using a workflow name
-
-This Markdown example adds a status badge for a workflow with the name "Greet Everyone." The `OWNER` of the repository is the `actions` organization and the `REPOSITORY` name is `hello-world`.
-
-```markdown
-![example workflow name](https://github.com/actions/hello-world/workflows/Greet%20Everyone/badge.svg)
-```
-
-### Using a workflow file path
-
-This Markdown example adds a status badge for a workflow with the file path `.github/workflows/main.yml`. The `OWNER` of the repository is the `actions` organization and the `REPOSITORY` name is `hello-world`.
+This Markdown example adds a status badge for a workflow with the file path `.github/workflows/main.yml`. The `OWNER` of the repository is the `github` organization and the `REPOSITORY` name is `docs`.
 
 ```markdown
-![example workflow file path](https://github.com/actions/hello-world/workflows/.github/workflows/main.yml/badge.svg)
+![example workflow](https://github.com/github/docs/actions/workflows/main.yml/badge.svg)
 ```
 
 ### Using the `branch` parameter
 
 This Markdown example adds a status badge for a branch with the name `feature-1`.
 
 ```markdown
-![example branch parameter](https://github.com/actions/hello-world/workflows/Greet%20Everyone/badge.svg?branch=feature-1)
+![example branch parameter](https://github.com/github/docs/actions/workflows/main.yml/badge.svg?branch=feature-1)
 ```
 
 ### Using the `event` parameter
 
 This Markdown example adds a badge that displays the status of workflow runs triggered by the `pull_request` event.
 
 ```markdown
-![example event parameter](https://github.com/actions/hello-world/workflows/Greet%20Everyone/badge.svg?event=pull_request)
+![example event parameter](https://github.com/github/docs/actions/workflows/main.yml/badge.svg?event=pull_request)
 ```

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

@@ -271,6 +271,12 @@ on:
   deployment_status
 ```
 
+{% note %}
+
+**Note:** When a deployment status's state is set to `inactive`, a webhook event will not be created.
+
+{% endnote %}
+
 #### `fork`
 
 Runs your workflow anytime when someone forks a repository, which triggers the `fork` event. For information about the REST API, see "[Create a fork](/rest/reference/repos#create-a-fork)."

content/actions/reference/workflow-syntax-for-github-actions.md

@@ -17,7 +17,7 @@ versions:
 
 ### About YAML syntax for workflows
 
-Workflow files use YAML syntax, and must have either a `.yml` or `.yaml` file extension. If you're new to YAML and want to learn more, see "[Learn YAML in five minutes](https://www.codeproject.com/Articles/1214409/Learn-YAML-in-five-minutes)."
+Workflow files use YAML syntax, and must have either a `.yml` or `.yaml` file extension. {% data reusables.actions.learn-more-about-yaml %}
 
 You must store workflow files in the `.github/workflows` directory of your repository.
 

data/release-notes/3-0/0.yml

@@ -1,4 +1,5 @@
 date: '2021-02-16'
+intro: The minimum infrastructure requirements have increased for {% data variables.product.prodname_ghe_server %} 3.0+. For more information, see "[About minimum requirements for GitHub Enterprise Server 3.0 and later](/admin/enterprise-management/upgrading-github-enterprise-server#about-minimum-requirements-for-github-enterprise-server-30-and-later)."
 sections:
   features:
     - heading: GitHub Actions

data/reusables/actions/learn-more-about-yaml.md

@@ -0,0 +1 @@
+If you're new to YAML and want to learn more, see "[Learn YAML in five minutes](https://www.codeproject.com/Articles/1214409/Learn-YAML-in-five-minutes)."

data/ui.yml

@@ -48,12 +48,6 @@ helpfulness:
   yes_feedback: Want to learn about new docs features and updates? Sign up for updates!
   email_placeholder: email@example.com
   no_feedback: We're continually improving our docs. We'd love to hear how we can do better.
-  category_label: What problem did you have?
-  category_default: Choose an option
-  category_unclear: Information was unclear
-  category_confusing: The content was confusing
-  category_unhelpful: The article didn't answer my question
-  category_other: Other
   comment_label: Let us know what we can do better
   optional: Optional
   required: Required

includes/helpfulness.html

@@ -52,38 +52,6 @@
     name="helpfulness-token"
     aria-hidden="true"
   />
-  <p hidden data-help-no>
-    <label
-      class="d-block mb-1 f6"
-      for="helpfulness-category"
-    >
-      {% data ui.helpfulness.category_label %}
-      <span class="text-normal text-gray-light float-right ml-1">
-        {% data ui.helpfulness.required %}
-      </span>
-    </label>
-    <select
-      class="form-control select-sm width-full"
-      name="helpfulness-category"
-      id="helpfulness-category"
-    >
-      <option value="">
-        {% data ui.helpfulness.category_default %}
-      </option>
-      <option value="Unclear">
-        {% data ui.helpfulness.category_unclear %}
-      </option>
-      <option value="Confusing">
-        {% data ui.helpfulness.category_confusing %}
-      </option>
-      <option value="Unhelpful">
-        {% data ui.helpfulness.category_unhelpful %}
-      </option>
-      <option value="Other">
-        {% data ui.helpfulness.category_other %}
-      </option>
-    </select>
-  </p>
   <p hidden data-help-no>
     <label
       class="d-block mb-1 f6"

javascripts/experiment.js

@@ -1,6 +1,8 @@
 import murmur from 'imurmurhash'
 import { getUserEventsId, sendEvent } from './events'
-// import h from './hyperscript'
+import h from './hyperscript'
+
+import { updateDisplay, submitForm } from './helpfulness'
 
 const TREATMENT = 'TREATMENT'
 const CONTROL = 'CONTROL'
@@ -11,7 +13,7 @@ export function bucket (test) {
   return hash % 2 ? TREATMENT : CONTROL
 }
 
-export async function sendSuccess (test) {
+export function sendSuccess (test) {
   return sendEvent({
     type: 'experiment',
     experiment_name: test,
@@ -21,8 +23,85 @@ export async function sendSuccess (test) {
 }
 
 export default function () {
+  // *** Example test code ***
   // const testName = '$test-name$'
   // const xbucket = bucket(testName)
-  // if (xbucket === TREATMENT) { ... }
+  // 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')
+  }
 }