Skip to content

Commit b412efa

Browse files
authored
Merge branch 'main' into fix/github#14492
2 parents c9e4ba7 + e636651 commit b412efa

File tree

7 files changed

+162
-6
lines changed

7 files changed

+162
-6
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"davidanson.vscode-markdownlint",
2323
"bierner.markdown-preview-github-styles",
2424
"streetsidesoftware.code-spell-checker",
25-
"docs.open-reusables"
25+
"alistairchristie.open-reusables"
2626
],
2727

2828
// Use 'forwardPorts' to make a list of ports inside the container available locally.

content/code-security/dependabot/dependabot-alerts/about-dependabot-alerts.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ redirect_from:
77
- /github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies
88
- /code-security/supply-chain-security/about-alerts-for-vulnerable-dependencies
99
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-alerts-for-vulnerable-dependencies
10-
- /code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies
1110
versions:
1211
fpt: '*'
1312
ghes: '*'

content/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security.md

Lines changed: 156 additions & 0 deletions
Large diffs are not rendered by default.

content/code-security/supply-chain-security/understanding-your-software-supply-chain/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ topics:
1111
- Repositories
1212
shortTitle: Understand your supply chain
1313
children:
14+
- /about-supply-chain-security
1415
- /about-the-dependency-graph
1516
- /about-dependency-review
1617
- /exploring-the-dependencies-of-a-repository

content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,5 @@ You can manage access to {% data variables.product.prodname_GH_advanced_security
163163

164164
- "[Securing your repository](/code-security/getting-started/securing-your-repository)"{% ifversion not fpt %}
165165
- "[About secret scanning](/github/administering-a-repository/about-secret-scanning)"{% endif %}{% ifversion not ghae %}
166-
- "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)"{% endif %}{% ifversion fpt or ghec or ghes > 3.2 %}
167-
- "[Keeping your dependencies updated automatically](/github/administering-a-repository/keeping-your-dependencies-updated-automatically)"{% endif %}
166+
- "[About the dependency graph](/github/visualizing-repository-data-with-graphs/about-the-dependency-graph)"{% endif %}{% ifversion fpt or ghec or ghes or ghae-issue-4864 %}
167+
- "[About supply chain security](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-supply-chain-security)"{% endif %}

content/packages/working-with-a-github-packages-registry/working-with-the-rubygems-registry.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ You can use gems from {% data variables.product.prodname_registry %} much like y
136136
end
137137
```
138138

139-
3. For Bundler versions earlier than 1.7.0, you need to add a new global `source`. For more information on using Bundler, see the [bundler.io documentation](http://bundler.io/v1.5/gemfile.html).
139+
3. For Bundler versions earlier than 1.7.0, you need to add a new global `source`. For more information on using Bundler, see the [bundler.io documentation](https://bundler.io/gemfile.html).
140140

141141
```ruby
142142
source "https://{% ifversion fpt or ghec %}rubygems.pkg.github.com{% else %}REGISTRY-URL{% endif %}/OWNER"

data/product-examples/code-security/code-examples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# Security policies
2222
- title: Microsoft security policy template
2323
description: Example security policy
24-
href: https://github.com/microsoft/repo-templates/blob/main/shared/SECURITY.md
24+
href: /microsoft/repo-templates/blob/main/shared/SECURITY.md
2525
tags:
2626
- Security policy
2727
- title: Electron security policy

0 commit comments

Comments
 (0)