Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v6.14.12 #2966

Merged
merged 5 commits into from Mar 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions AUTHORS
Expand Up @@ -708,5 +708,7 @@ Sandra Tatarevićová <sandra@tatarevicova.cz>
Antoine du Hamel <duhamelantoine1995@gmail.com>
Assaf Sapir <assapir@github.com>
Lukas Spieß <lumaxis@github.com>
Darcy Clarke <darcyclarke@GH.local>
darcyclarke marked this conversation as resolved.
Show resolved Hide resolved
Jim Fisher <jameshfisher@gmail.com>
Xavier Guimard <yadd@debian.org>
Attila Večerek <avecerek@zendesk.com>
9 changes: 9 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,12 @@
## 6.14.12 (2021-03-25)

### DEPENDENCIES

* [`e47654048`](https://github.com/npm/cli/commit/e4765404844a0b6795752b2bc6f9b9107fe713be)
[#2737](https://github.com/npm/cli/pull/2737)
Update y18n to fix CVE-2020-7774
([@vecerek](https://github.com/vecerek))

## 6.14.11 (2021-01-07)
### DEPENDENCIES

Expand Down
7 changes: 7 additions & 0 deletions node_modules/y18n/CHANGELOG.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node_modules/y18n/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 16 additions & 14 deletions node_modules/y18n/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
@@ -1,5 +1,5 @@
{
"version": "6.14.11",
"version": "6.14.12",
"name": "npm",
"description": "a package manager for JavaScript",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion test/tap/git-npmignore.js
Expand Up @@ -152,7 +152,7 @@ function setup (cb) {

var git = escapeArg(gitPath)

exec(git + ' init', {cwd: dep}, init)
exec(git + ' init --initial-branch=main', {cwd: dep}, init)

function init (er, _, stderr) {
if (er) return cb(er)
Expand Down