Merge branch 'main' into patch-1

Author: janiceilene

.github/workflows/browser-test.yml

@@ -2,10 +2,10 @@ name: Browser Tests
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
-  pull_request:
+  # push:
+  #   branches:
+  #     - main
+  # pull_request:
 
 jobs:
   see_if_should_skip:

…lp/desktop/click-branch-in-drop-down.png …esktop/click-branch-in-drop-down-mac.pngassets/images/help/desktop/click-branch-in-drop-down.png renamed to assets/images/help/desktop/click-branch-in-drop-down-mac.png assets/images/help/desktop/click-branch-in-drop-down.png renamed to assets/images/help/desktop/click-branch-in-drop-down-mac.png

@@ -75,7 +75,7 @@ jobs:
         run: |
           expr 1 + 1 > output.log
       - name: Upload output file
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         with:
           name: output-log-file
           path: output.log

content/actions/learn-github-actions/essential-features-of-github-actions.md

@@ -638,6 +638,27 @@ jobs:
         uses: docker://gcr.io/cloud-builders/gradle
 ```
 
+#### Example using action inside a different private repository than the workflow
+
+Your workflow must checkout the private repository and reference the action locally.
+
+{% raw %}
+```yaml
+jobs:
+  my_first_job:
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+        with:
+          repository: octocat/my-private-repo
+          ref: v1.0
+          token: ${{ secrets.GITHUB_TOKEN }}
+          path: ./.github/actions/my-private-repo
+      - name: Run my action
+        uses: ./.github/actions/my-private-repo/my-action
+```
+{% endraw %}
+
 ### `jobs.<job_id>.steps[*].run`
 
 Runs command-line programs using the operating system's shell. If you do not provide a `name`, the step name will default to the text specified in the `run` command.

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

@@ -23,7 +23,7 @@ You're under no obligation to choose a license. However, without a license, the
 
 ### Determining the location of your license
 
-Most people place their license text in a file named `LICENSE.txt` (or `LICENSE.md`) in the root of the repository; [here's an example from Hubot](https://github.com/github/hubot/blob/master/LICENSE.md).
+Most people place their license text in a file named `LICENSE.txt` (or `LICENSE.md` or `LICENSE.rst`) in the root of the repository; [here's an example from Hubot](https://github.com/github/hubot/blob/master/LICENSE.md).
 
 Some projects include information about their license in their README. For example, a project's README may include a note saying "This project is licensed under the terms of the MIT license."
 

content/github/creating-cloning-and-archiving-repositories/licensing-a-repository.md

@@ -45,7 +45,7 @@ You can search for the following information across all repositories you can acc
 - [Discussions](/github/searching-for-information-on-github/searching-discussions){% endif %}
 - [Code](/articles/searching-code)
 - [Commits](/articles/searching-commits)
-- [Users](/articles/searching-users){% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest"  or currentVersion ver_gt "enterprise-server@2.1"  %}
+- [Users](/articles/searching-users){% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest"  or currentVersion ver_gt "enterprise-server@2.21" %}
 - [Packages](/github/searching-for-information-on-github/searching-for-packages){% endif %}
 - [Wikis](/articles/searching-wikis)
 

content/github/searching-for-information-on-github/about-searching-on-github.md

@@ -35,8 +35,9 @@ The repository owner has full control of the repository. In addition to the acti
 | Delete the repository | "[Deleting a repository](/github/administering-a-repository/deleting-a-repository)" |
 | Manage the repository's topics | "[Classifying your repository with topics](/github/administering-a-repository/classifying-your-repository-with-topics)" |{% if currentVersion == "free-pro-team@latest" %}
 | Manage security and analysis settings for the repository | "[Managing security and analysis settings for your repository](/github/administering-a-repository/managing-security-and-analysis-settings-for-your-repository)" |{% endif %}{% if currentVersion == "free-pro-team@latest" %}
-| Enable the dependency graph for a private repository | "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository)" |{% endif %}
-{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}| Delete and restore packages | "[Deleting and restoring a package](/packages/learn-github-packages/deleting-and-restoring-a-package)" |{% elsif currentVersion ver_lt "enterprise-server@3.1" or currentVersion == "github-ae@latest" %}| Delete packages | "[Deleting packages](/packages/learn-github-packages/deleting-a-package)" |{% endif %}
+| Enable the dependency graph for a private repository | "[Exploring the dependencies of a repository](/github/visualizing-repository-data-with-graphs/exploring-the-dependencies-of-a-repository#enabling-and-disabling-the-dependency-graph-for-a-private-repository)" |{% endif %}{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@3.0" %}
+| Delete and restore packages | "[Deleting and restoring a package](/packages/learn-github-packages/deleting-and-restoring-a-package)" |{% endif %}{% if currentVersion == "enterprise-server@2.22" or currentVersion == "enterprise-server@3.0" or currentVersion == "github-ae@latest" %}
+| Delete packages | "[Deleting packages](/packages/learn-github-packages/deleting-a-package)" |{% endif %}
 | Customize the repository's social media preview | "[Customizing your repository's social media preview](/github/administering-a-repository/customizing-your-repositorys-social-media-preview)" |
 | Create a template from the repository | "[Creating a template repository](/github/creating-cloning-and-archiving-repositories/creating-a-template-repository)" |{% if currentVersion == "free-pro-team@latest" or enterpriseServerVersions contains currentVersion %}
 | Receive {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "enterprise-server@2.21" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %} for vulnerable dependencies | "[About alerts for vulnerable dependencies](/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies)" |{% endif %}{% if currentVersion == "free-pro-team@latest" %}

content/github/setting-up-and-managing-your-github-user-account/permission-levels-for-a-user-account-repository.md

@@ -1,2 +1,2 @@
 1. In the left sidebar, click **OAuth Apps**.
-![OAuth Apps section](/assets/images/settings/developer-settings-oauth-apps.png)
+![OAuth Apps section](/assets/images/help/settings/developer-settings-oauth-apps.png)

data/reusables/user-settings/oauth_apps.md

@@ -66,6 +66,10 @@ module.exports = async function renderContent (
         .trim()
     }
 
+    if (options.cheerioObject) {
+      return cheerio.load(html, { xmlMode: true })
+    }
+
     if (options.encodeEntities) html = entities.encode(html)
 
     return html.trim()

lib/render-content/renderContent.js

@@ -139709,7 +139709,7 @@
                   "name",
                   "head_sha"
                 ],
-                "anyOf": [
+                "oneOf": [
                   {
                     "properties": {
                       "status": {
@@ -139719,6 +139719,7 @@
                       }
                     },
                     "required": [
+                      "status",
                       "conclusion"
                     ],
                     "additionalProperties": true