Merge branch 'main' into indented-data-ref-parsing

.github/PULL_REQUEST_TEMPLATE.md

@@ -25,3 +25,11 @@ Thanks again!
 - [ ] I have reviewed my changes in staging. (look for the **deploy-to-heroku** link in your pull request, then click **View deployment**)
 - [ ] For content changes, I have reviewed the [localization checklist](https://github.com/github/docs/blob/main/contributing/localization-checklist.md)
 - [ ] For content changes, I have reviewed the [Content style guide for GitHub Docs](https://github.com/github/docs/blob/main/contributing/content-style-guide.md).
+
+### Writer impact (This section is for GitHub staff members only):
+
+- [ ] This pull request impacts the contribution experience
+  - [ ] I have added the 'writer impact' label
+  - [ ] I have added a description and/or a video demo of the changes below (eg. a "before and after video")
+
+<!-- Description of the writer impact here -->

content/admin/user-management/migrating-to-internal-repositories.md

@@ -34,6 +34,12 @@ If you don't have private mode enabled, the migration script will have no effect
 ### Running the migration
 
 1. Connect to the administrative shell. For more information, see "[Accessing the administrative shell (SSH)](/enterprise/admin/installation/accessing-the-administrative-shell-ssh)."
+{% if currentVersion ver_gt "[email protected]" or currentVersion == "github-ae@latest" %}
+2. Run the migration command.
+   ```shell
+   github-env bin/safe-ruby lib/github/transitions/20191210220630_convert_public_ghes_repos_to_internal.rb --verbose -w |  tee -a /tmp/convert_public_ghes_repos_to_internal.log
+   ```
+{% else %}
 2. Navigate to the `/data/github/current` directory.
    ```shell
    cd /data/github/current
@@ -42,6 +48,7 @@ If you don't have private mode enabled, the migration script will have no effect
    ```shell
    sudo bin/safe-ruby lib/github/transitions/20191210220630_convert_public_ghes_repos_to_internal.rb --verbose -w | tee -a /tmp/convert_public_ghes_repos_to_internal.log
    ```
+{% endif %}
 
 Log output will appear in the terminal and `/tmp/convert_public_ghes_repos_to_internal.log`.
 

content/code-security/supply-chain-security/index.md

@@ -20,6 +20,7 @@ topics:
     {% link_in_list /exploring-the-dependencies-of-a-repository %}
 {% topic_link_in_list /keeping-your-dependencies-updated-automatically %}
     {% link_in_list /about-dependabot-version-updates %}
+    {% link_in_list /upgrading-from-dependabotcom-to-github-native-dependabot %}
     {% link_in_list /enabling-and-disabling-version-updates %}
     {% link_in_list /listing-dependencies-configured-for-version-updates %}
     {% link_in_list /managing-pull-requests-for-dependency-updates %}

content/code-security/supply-chain-security/upgrading-from-dependabotcom-to-github-native-dependabot.md

@@ -0,0 +1,36 @@
+---
+title: Upgrading from Dependabot.com to GitHub-native Dependabot
+intro: 'You can upgrade to GitHub-native Dependabot by merging a pull request that will allow your dependencies to continue being updated.'
+versions:
+  free-pro-team: '*'
+topics:
+  - repositories
+---
+
+### About upgrading from Dependabot Preview to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}
+
+Dependabot Preview has been built directly into {% data variables.product.prodname_dotcom %}, so you can use {% data variables.product.prodname_dependabot %} alongside all the other functionality in {% data variables.product.prodname_dotcom %} without having to install and use a separate application. By migrating to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, we can also focus on bringing lots of exciting new features to {% data variables.product.prodname_dependabot %}, including more [ecosystem updates](https://github.com/github/roadmap/issues/150), [improved notifications](https://github.com/github/roadmap/issues/133), and {% data variables.product.prodname_dependabot %} support for [{% data variables.product.prodname_ghe_server %}](https://github.com/github/roadmap/issues/86) and [{% data variables.product.prodname_ghe_managed %}](https://github.com/github/roadmap/issues/135).
+
+### Differences between Dependabot Preview and {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}
+
+While most of the Dependabot Preview features exist in {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, a few remain unavailable: 
+- **Live updates:** We hope to bring these back in the future. For now, you can run {% data variables.product.prodname_dotcom %} {% data variables.product.prodname_dependabot %} daily to catch new packages within one day of release.
+- **PHP environment variable registries:** For now, you can use {% data variables.product.prodname_actions %} to fetch dependencies from these registries.
+- **Auto-merge:** We always recommend verifying your dependencies before merging them; therefore, auto-merge will not be supported for the foreseeable future. For those of you who have vetted your dependencies, or are only using internal dependencies, we recommend adding third-party auto-merge apps, or setting up GitHub Actions to merge.
+
+In {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, you can configure all version updates using the configuration file. This file is similar to the Dependabot Preview configuration file with a few changes and improvements that will be automatically included in your upgrade pull request. For more information about the upgrade pull request, see "[Upgrading to GitHub-native Dependabot](/code-security/supply-chain-security/upgrading-from-dependabotcom-to-github-native-dependabot#upgrading-to-github-native-dependabot)".
+
+To see update logs for {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} that were previously on the Dependabot.com dashboard:
+
+  1. Navigate to your repository’s **Insights** page.
+  2. Click **Dependency graph** to the left.
+  3. Click **{% data variables.product.prodname_dependabot %}**.
+
+For more information about version updates with {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, see "[About Dependabot version updates](/code-security/supply-chain-security/about-dependabot-version-updates)."
+
+### Upgrading to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}
+
+Upgrading from Dependabot Preview to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} requires only one step: merge the *Upgrade to GitHub-native Dependabot* pull request in your repository. This pull request includes the updated configuration file needed for {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}.
+
+If you have any questions or need help migrating, you can view or open issues in the [dependabot/dependabot-core](https://github.com/dependabot/dependabot-core/issues) repository.
+

content/communities/documenting-your-project-with-wikis/about-wikis.md

@@ -22,6 +22,12 @@ With wikis, you can write content just like everywhere else on {% data variables
 
 You can edit wikis directly on {% data variables.product.product_name %}, or you can edit wiki files locally. By default, only people with write access to your repository can make changes to wikis, although you can allow everyone on {% data variables.product.product_location %} to contribute to a wiki in {% if currentVersion == "github-ae@latest" %}an internal{% else %}a public{% endif %} repository. For more information, see "[Changing access permissions for wikis](/communities/documenting-your-project-with-wikis/changing-access-permissions-for-wikis)".
 
+{% note %}
+
+**Note:** Search engines will not index the contents of wikis. To have your content indexed by search engines, you can use [{% data variables.product.prodname_pages %}](/pages) in a public repository.
+
+{% endnote %}
+
 ### Further reading
 
 - "[Adding or editing wiki pages](/communities/documenting-your-project-with-wikis/adding-or-editing-wiki-pages)"

content/developers/overview/secret-scanning.md

@@ -88,6 +88,12 @@ We strongly recommend you implement signature validation in your secret alert se
 
 You can retrieve the {% data variables.product.prodname_dotcom %} secret scanning public key from https://api.github.com/meta/public_keys/secret_scanning and validate the message using the `ECDSA-NIST-P256V1-SHA256` algorithm.
 
+{% note %}
+
+**Note**: When you send a request to the public key endpoint above, you may hit rate limits. To avoid hitting rate limits, you can use a personal access token as suggested below, or use a conditional request. For more information, see "[Getting started with the REST API](/rest/guides/getting-started-with-the-rest-api#conditional-requests)."
+
+{% endnote %}
+
 Assuming you receive the following message, the code snippets below demonstrate how you could perform signature validation.
 The code also assumes you've set an environment variable called `GITHUB_PRODUCTION_TOKEN` with a generated PAT (https://github.com/settings/tokens). The token does not need any permissions set.
 
@@ -358,4 +364,3 @@ A few important points:
 **Note:** Our request timeout is set to be higher (that is, 30 seconds) for partners who provide data about false positives. If you require a timeout higher than 30 seconds, email us at <a href="mailto:[email protected]">[email protected]</a>.
 
 {% endnote %}
-

content/github/managing-your-work-on-github/about-automation-for-issues-and-pull-requests-with-query-parameters.md

@@ -21,7 +21,7 @@ Query parameters are optional parts of a URL you can customize to share a specif
 
 You must have the proper permissions for any action to use the equivalent query parameter. For example, you must have permission to add a label to an issue to use the `labels` query parameter.
 
-If you create an invalid URL using query parameters, or if you don’t have the proper permissions, the URL will return a 404 error page.  
+If you create an invalid URL using query parameters, or if you don’t have the proper permissions, the URL will return a `404 Not Found` error page. If you create a URL that exceeds the server limit, the URL will return a `414 URI Too Long` error page.
 
 ### Supported query parameters
 

includes/header.html

@@ -22,7 +22,7 @@
             <div class="py-2 py-md-0 d-md-inline-block">
               <h4 class="text-mono f5 text-normal color-text-secondary d-md-none">{% data ui.homepage.explore_by_product %}</h4>
               <details class="dropdown-withArrow position-relative details details-reset d-md-none close-when-clicked-outside">
-                <summary class="nav-desktop-productDropdownButton color-text-link-mktg py-2" role="button" aria-label="Toggle products list">
+                <summary class="nav-desktop-productDropdownButton color-text-link py-2" role="button" aria-label="Toggle products list">
                   <div id="current-product" class="d-flex flex-items-center flex-justify-between" style="padding-top: 2px;">
                     <!-- Product switcher - GitHub.com, Enterprise Server, etc -->
                     <!-- 404 and 500 error layouts are not real pages so we need to hardcode the name for those -->
@@ -35,7 +35,7 @@ <h4 class="text-mono f5 text-normal color-text-secondary d-md-none">{% data ui.h
                   {% for product in activeProducts %}
                   <a href="{% unless product.external %}/{{ currentLanguage }}{% endunless %}{{ product.href }}"
                       class="d-block py-2
-                      {% if product.id == currentProduct %}color-text-link-mktg text-underline active{% elsif product.id == currentProduct.id %}color-text-link-mktg text-underline active{% else %}Link--primary no-underline{% endif %}">
+                      {% if product.id == currentProduct %}color-text-link text-underline active{% elsif product.id == currentProduct.id %}color-text-link text-underline active{% else %}Link--primary no-underline{% endif %}">
                       {{ product.name }}
                       {% if product.external %}
                       <span class="ml-1"><svg width="9" height="10" viewBox="0 0 9 10" fill="none" xmlns="http://www.w3.org/2000/svg"><path stroke="currentColor" d="M.646 8.789l8-8M8.5 9V1M1 .643h8"/></svg></span>

stylesheets/article.scss

@@ -10,8 +10,8 @@
     grid-template-rows: auto 1fr;
     grid-template-columns: minmax(500px, 720px) minmax(220px, 1fr);
     grid-template-areas:
-    'top right-sidebar'
-    'bottom right-sidebar';
+      "top right-sidebar"
+      "bottom right-sidebar";
     column-gap: $spacer-6;
   }
 
@@ -45,7 +45,6 @@
 /* Deprecation banner
 ------------------------------------------------------------------------------*/
 .deprecation-banner {
-
   & + .alert {
     margin-top: 5px;
   }
@@ -58,24 +57,21 @@
     margin-bottom: 0;
   }
 
-  + #bootcamp {
-    margin-top: 20px;
-  }
-
   b,
   strong {
     font-weight: bold;
   }
 
   p {
-   margin: 0;
+    margin: 0;
   }
 }
 
 /* Code style overrides
 ------------------------------------------------------------------------------*/
 
-.markdown-body .highlight pre, .markdown-body pre {
+.markdown-body .highlight pre,
+.markdown-body pre {
   margin-top: 10px;
 }
 
@@ -93,12 +89,13 @@
   }
 }
 
-.breadcrumbs a:not(:last-child)::after, .breadcrumbs span:not(:last-child)::after {
-  content: '/';
+.breadcrumbs a:not(:last-child)::after,
+.breadcrumbs span:not(:last-child)::after {
+  content: "/";
   color: var(--color-auto-gray-4);
   padding-right: $spacer-1;
   padding-left: $spacer-2;
-  display:inline-block;
+  display: inline-block;
 }
 
 /* Numbered procedures (step 1, step 2, ...)
@@ -181,7 +178,8 @@ img[src*="https://github.githubassets.com/images/icons/emoji"] {
 .warning,
 .danger {
   // remove extra space under lists inside of notes
-  ul, ol {
+  ul,
+  ol {
     margin-bottom: 0;
   }
 }

stylesheets/dev-toc.scss

@@ -11,4 +11,4 @@ ul.versions-list > li {
 
 details ul.products-list li {
   margin: 3px 0 0 30px;
-}
+}

stylesheets/gradient.scss

@@ -1,6 +1,11 @@
 $gradients: (
-  "-purple-pink": linear-gradient(135deg, var(--color-auto-purple-5) 0%, var(--color-auto-pink-5) 100%),
-/*"-aquamarine-mauve":  linear-gradient(130deg, #3bf0e4 -6.8%, #bca1f7 70%),
+  "-purple-pink":
+    linear-gradient(
+      135deg,
+      var(--color-auto-purple-5) 0%,
+      var(--color-auto-pink-5) 100%
+    ),
+  /*"-aquamarine-mauve":  linear-gradient(130deg, #3bf0e4 -6.8%, #bca1f7 70%),
   "-purple-coral":  linear-gradient(87.54deg, #9867f0 -6.8%, #ed4e50 84.14%),
   "-purple-coral-dark": linear-gradient(92deg, #bca1f7 15%, #e577b4 45%, #ff7170 85%),
   "-coral-yellow":  linear-gradient(267.91deg, #ffe57f 9.35%, #ff7170 96.48%),
@@ -12,9 +17,24 @@ $gradients: (
   "-blue-green": linear-gradient(-70deg, #2188ff 0%, #01a49e 100%),
   "-red-orange": linear-gradient(-70deg, #ed4e50 0%, #f06f00 100%),
   "-blue-purple": linear-gradient(-70deg, #2188ff 0%, #804eda 100%), */
-  "-pink-blue": linear-gradient(90deg, var(--color-auto-pink-5) -50%, var(--color-auto-blue-5) 150%),
-  "-pink-blue-dark": linear-gradient(-70deg, var(--color-auto-pink-3) 0%, var(--color-auto-blue-3) 100%),
-  "-blue-pink": linear-gradient(-70deg, var(--color-auto-blue-5) 0%, var(--color-auto-pink-5) 100%)
+    "-pink-blue":
+    linear-gradient(
+      90deg,
+      var(--color-auto-pink-5) -50%,
+      var(--color-auto-blue-5) 150%
+    ),
+  "-pink-blue-dark":
+    linear-gradient(
+      -70deg,
+      var(--color-auto-pink-3) 0%,
+      var(--color-auto-blue-3) 100%
+    ),
+  "-blue-pink":
+    linear-gradient(
+      -70deg,
+      var(--color-auto-blue-5) 0%,
+      var(--color-auto-pink-5) 100%
+    )
 ) !default;
 
 @mixin bg-gradient($parent, $gradient) {
@@ -23,15 +43,17 @@ $gradients: (
   }
 }
 
+/*
 @mixin text-gradient($parent, $gradient) {
-  #{$parent} {
+  #{parent} {
     background-image: $gradient;
     -webkit-background-clip: text;
     background-clip: text;
     -webkit-text-fill-color: transparent;
     color: transparent;
   }
 }
+*/
 
 $border-width: 2px;
 @mixin border-gradient($parent, $gradient) {
@@ -71,9 +93,11 @@ $border-width: 2px;
   @include bg-gradient(".bg-gradient-#{$gradient}", $value);
 }
 
+/*
 @each $gradient, $value in $gradients {
-  @include text-gradient(".text-gradient-#{$gradient}", $value);
+  @include text-gradient(".text-gradient-#{gradient}", $value);
 }
+*/
 
 @each $gradient, $value in $gradients {
   @include border-gradient(".border-gradient-#{$gradient}", $value);

stylesheets/index.scss

@@ -12,7 +12,6 @@ $marketing-font-path: "/dist/fonts/";
 @import "new-mktg.scss";
 @import "type.scss";
 @import "nav.scss";
-@import "directory.scss";
 @import "article.scss";
 @import "search.scss";
 @import "overrides.scss";

stylesheets/nav.scss

@@ -46,14 +46,14 @@ header summary,
 }
 
 .nav-mobile-burgerIcon {
-  background: url('/assets/images/octicons/hamburger.svg') no-repeat right;
+  background: url("/assets/images/octicons/hamburger.svg") no-repeat right;
   width: 18px;
   height: 23px;
   position: relative;
   z-index: 3;
 
   &.js-open {
-    background: url('/assets/images/octicons/x.svg') no-repeat right;
+    background: url("/assets/images/octicons/x.svg") no-repeat right;
     width: 16px;
     height: 21px;
   }
@@ -91,7 +91,7 @@ header summary,
   }
 }
 
-.nav-dropdown  {
+.nav-dropdown {
   @media (min-width: 1012px) and (max-width: 1279px) {
     right: 0;
   }