Skip to content

Commit b0bf54b

Browse files
authored
Merge branch 'main' into indented-data-ref-parsing
2 parents ce37aae + 3af7d96 commit b0bf54b

27 files changed

Lines changed: 185 additions & 218 deletions

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,11 @@ Thanks again!
2525
- [ ] I have reviewed my changes in staging. (look for the **deploy-to-heroku** link in your pull request, then click **View deployment**)
2626
- [ ] For content changes, I have reviewed the [localization checklist](https://github.com/github/docs/blob/main/contributing/localization-checklist.md)
2727
- [ ] 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).
28+
29+
### Writer impact (This section is for GitHub staff members only):
30+
31+
- [ ] This pull request impacts the contribution experience
32+
- [ ] I have added the 'writer impact' label
33+
- [ ] I have added a description and/or a video demo of the changes below (eg. a "before and after video")
34+
35+
<!-- Description of the writer impact here -->
-39.3 KB
Loading
-31.8 KB
Loading

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ If you don't have private mode enabled, the migration script will have no effect
3434
### Running the migration
3535

3636
1. Connect to the administrative shell. For more information, see "[Accessing the administrative shell (SSH)](/enterprise/admin/installation/accessing-the-administrative-shell-ssh)."
37+
{% if currentVersion ver_gt "enterprise-server@2.22" or currentVersion == "github-ae@latest" %}
38+
2. Run the migration command.
39+
```shell
40+
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
41+
```
42+
{% else %}
3743
2. Navigate to the `/data/github/current` directory.
3844
```shell
3945
cd /data/github/current
@@ -42,6 +48,7 @@ If you don't have private mode enabled, the migration script will have no effect
4248
```shell
4349
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
4450
```
51+
{% endif %}
4552

4653
Log output will appear in the terminal and `/tmp/convert_public_ghes_repos_to_internal.log`.
4754

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ topics:
2020
{% link_in_list /exploring-the-dependencies-of-a-repository %}
2121
{% topic_link_in_list /keeping-your-dependencies-updated-automatically %}
2222
{% link_in_list /about-dependabot-version-updates %}
23+
{% link_in_list /upgrading-from-dependabotcom-to-github-native-dependabot %}
2324
{% link_in_list /enabling-and-disabling-version-updates %}
2425
{% link_in_list /listing-dependencies-configured-for-version-updates %}
2526
{% link_in_list /managing-pull-requests-for-dependency-updates %}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
title: Upgrading from Dependabot.com to GitHub-native Dependabot
3+
intro: 'You can upgrade to GitHub-native Dependabot by merging a pull request that will allow your dependencies to continue being updated.'
4+
versions:
5+
free-pro-team: '*'
6+
topics:
7+
- repositories
8+
---
9+
10+
### About upgrading from Dependabot Preview to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}
11+
12+
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).
13+
14+
### Differences between Dependabot Preview and {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}
15+
16+
While most of the Dependabot Preview features exist in {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}, a few remain unavailable:
17+
- **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.
18+
- **PHP environment variable registries:** For now, you can use {% data variables.product.prodname_actions %} to fetch dependencies from these registries.
19+
- **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.
20+
21+
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)".
22+
23+
To see update logs for {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %} that were previously on the Dependabot.com dashboard:
24+
25+
1. Navigate to your repository’s **Insights** page.
26+
2. Click **Dependency graph** to the left.
27+
3. Click **{% data variables.product.prodname_dependabot %}**.
28+
29+
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)."
30+
31+
### Upgrading to {% data variables.product.prodname_dotcom %}-native {% data variables.product.prodname_dependabot %}
32+
33+
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 %}.
34+
35+
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.
36+

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ With wikis, you can write content just like everywhere else on {% data variables
2222

2323
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)".
2424

25+
{% note %}
26+
27+
**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.
28+
29+
{% endnote %}
30+
2531
### Further reading
2632

2733
- "[Adding or editing wiki pages](/communities/documenting-your-project-with-wikis/adding-or-editing-wiki-pages)"

content/developers/overview/secret-scanning.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,12 @@ We strongly recommend you implement signature validation in your secret alert se
8888

8989
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.
9090

91+
{% note %}
92+
93+
**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)."
94+
95+
{% endnote %}
96+
9197
Assuming you receive the following message, the code snippets below demonstrate how you could perform signature validation.
9298
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.
9399

@@ -358,4 +364,3 @@ A few important points:
358364
**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:secret-scanning@github.com">secret-scanning@github.com</a>.
359365
360366
{% endnote %}
361-

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Query parameters are optional parts of a URL you can customize to share a specif
2121

2222
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.
2323

24-
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.
24+
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.
2525

2626
### Supported query parameters
2727

includes/header.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<div class="py-2 py-md-0 d-md-inline-block">
2323
<h4 class="text-mono f5 text-normal color-text-secondary d-md-none">{% data ui.homepage.explore_by_product %}</h4>
2424
<details class="dropdown-withArrow position-relative details details-reset d-md-none close-when-clicked-outside">
25-
<summary class="nav-desktop-productDropdownButton color-text-link-mktg py-2" role="button" aria-label="Toggle products list">
25+
<summary class="nav-desktop-productDropdownButton color-text-link py-2" role="button" aria-label="Toggle products list">
2626
<div id="current-product" class="d-flex flex-items-center flex-justify-between" style="padding-top: 2px;">
2727
<!-- Product switcher - GitHub.com, Enterprise Server, etc -->
2828
<!-- 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
3535
{% for product in activeProducts %}
3636
<a href="{% unless product.external %}/{{ currentLanguage }}{% endunless %}{{ product.href }}"
3737
class="d-block py-2
38-
{% 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 %}">
38+
{% 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 %}">
3939
{{ product.name }}
4040
{% if product.external %}
4141
<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>

0 commit comments

Comments
 (0)