Skip to content

Commit 37db8b6

Browse files
authored
repo sync
2 parents ceb9733 + 0ba017e commit 37db8b6

9 files changed

Lines changed: 21 additions & 15 deletions

File tree

.github/workflows/repo-sync.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
repo-sync:
1818
name: Repo Sync
1919
runs-on: ubuntu-latest
20-
continue-on-error: true
2120
steps:
2221

2322
- name: Exit if repo is frozen

content/github/administering-a-repository/configuration-options-for-dependency-updates.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -546,12 +546,6 @@ updates:
546546

547547
Use the `vendor` option to tell {% data variables.product.prodname_dependabot_short %} to vendor dependencies when updating them.
548548

549-
{% note %}
550-
551-
Currently, {% data variables.product.prodname_dependabot_short %} only supports vendoring dependencies for Bundler.
552-
553-
{% endnote %}
554-
555549
```yaml
556550
# Configure version updates for both dependencies defined in manifests and vendored dependencies
557551
@@ -565,7 +559,13 @@ updates:
565559
interval: "weekly"
566560
```
567561

568-
{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository. For Bundler, the dependencies must be in the _vendor/cache_ directory. Other file paths are not supported. For more information, see the [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html).
562+
{% data variables.product.prodname_dependabot_short %} only updates the vendored dependencies located in specific directories in a repository.
563+
564+
| Package manager | Required file path for vendored dependencies | More information |
565+
|------------------|-------------------------------|--------|
566+
| `bundler` | The dependencies must be in the _vendor/cache_ directory.</br>Other file paths are not supported. | [`bundle cache` documentation](https://bundler.io/man/bundle-cache.1.html) |
567+
| `gomod` | No path requirement (dependencies are usually located in the _vendor_ directory) | [`go mod vendor` documentation](https://golang.org/ref/mod#go-mod-vendor) |
568+
569569

570570
### `versioning-strategy`
571571

content/github/finding-security-vulnerabilities-and-errors-in-your-code/managing-code-scanning-alerts-for-your-repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Anyone with read permission for a repository can see {% data variables.product.p
3737
{% data reusables.repositories.navigate-to-repo %}
3838
{% data reusables.repositories.sidebar-security %}
3939
{% data reusables.repositories.sidebar-code-scanning-alerts %}
40-
1. Under "{% data variables.product.prodname_code_scanning %}," click the alert you'd like to explore.
40+
1. Under "{% data variables.product.prodname_code_scanning_capc %}," click the alert you'd like to explore.
4141
![Summary of alerts](/assets/images/help/repository/code-scanning-click-alert.png)
4242
1. Optionally, if the alert highlights a problem with data flow, click **Show paths** to display the path from the data source to the sink where it's used.
4343
![The "Show paths" link on an alert](/assets/images/help/repository/code-scanning-show-paths.png)

content/github/finding-security-vulnerabilities-and-errors-in-your-code/running-codeql-code-scanning-in-your-ci-system.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ versions:
99
free-pro-team: '*'
1010
enterprise-server: '>=2.22'
1111
---
12+
<!--UI-LINK: When GitHub Enterprise Server doesn't have GitHub Actions set up, the Security > Code scanning alerts view links to this article.-->
1213

1314
{% data reusables.code-scanning.beta-codeql-runner %}
1415
{% data reusables.code-scanning.beta %}

content/github/finding-security-vulnerabilities-and-errors-in-your-code/sarif-support-for-code-scanning.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ If you upload a SARIF file without fingerprint data using the `/code-scanning/sa
3636

3737
### Validating your SARIF file
3838

39+
<!--UI-LINK: When code scanning fails, the error banner shown in the Security > Code scanning alerts view links to this anchor.-->
40+
3941
You can check a SARIF file is compatible with {% data variables.product.prodname_code_scanning %} by testing it against the {% data variables.product.prodname_dotcom %} ingestion rules. For more information, visit the [Microsoft SARIF validator](https://sarifweb.azurewebsites.net/).
4042

4143
### Supported SARIF output file properties

data/reusables/dependabot/supported-package-managers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Docker: `docker` |
77
Elm: `elm` |
88
git submodule: `gitsubmodule` |
99
GitHub Actions: `github-actions` |
10-
Go modules: `gomod` |
10+
Go modules: `gomod` | **X**
1111
Gradle: `gradle` |
1212
Maven: `maven` |
1313
Mix: `mix` |

middleware/handle-csrf-errors.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module.exports = async function handleCSRFError (error, req, res, next) {
2+
// If the CSRF token is bad
3+
if (error.code === 'EBADCSRFTOKEN') {
4+
return res.sendStatus(403)
5+
}
6+
7+
return next(error)
8+
}

middleware/handle-errors.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,5 @@ module.exports = async function handleError (error, req, res, next) {
4848
}
4949
}
5050

51-
// If the CSRF token is bad
52-
if (error.code === 'EBADCSRFTOKEN') {
53-
return res.sendStatus(403)
54-
}
55-
5651
res.status(500).send(await liquid.parseAndRender(layouts['error-500'], req.context))
5752
}

middleware/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ module.exports = function (app) {
2828
app.use(require('./robots'))
2929
app.use(require('./cookie-parser'))
3030
app.use(require('./csrf'))
31+
app.use(require('./handle-csrf-errors'))
3132
app.use(require('compression')())
3233
app.use(require('connect-slashes')(false))
3334
app.use('/dist', express.static('dist'))

0 commit comments

Comments
 (0)