1
0
mirror of https://github.com/verdaccio/verdaccio.git synced 2024-11-13 03:35:52 +01:00

Merge branch 'master' into master

This commit is contained in:
Juan Picado @jotadeveloper 2017-10-19 06:18:21 +02:00 committed by GitHub
commit e202f6275d
3 changed files with 42 additions and 3 deletions

@ -2,6 +2,21 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
<a name="2.6.0"></a>
# [2.6.0](https://github.com/verdaccio/verdaccio/compare/v2.5.1...v2.6.0) (2017-10-18)
### Bug Fixes
* plugin loader with logs ([d6ed202](https://github.com/verdaccio/verdaccio/commit/d6ed202))
### Features
* add pfx support for https ([c84d567](https://github.com/verdaccio/verdaccio/commit/c84d567))
<a name="2.5.1"></a>
## [2.5.1](https://github.com/verdaccio/verdaccio/compare/v2.5.0...v2.5.1) (2017-10-01)

@ -157,11 +157,35 @@ $ git status
#
# modified: somefile.js
#
$ git commit -m "Corrects some defect, fixes #12345, refs #12346"
[t12345 0000000] Corrects some defect, fixes #12345, refs #12346
$ git commit -m "fix: correct some defect, fixes #12345, refs #12346"
[t12345 0000000] fix: correct some defect, fixes #12345, refs #12346
1 file changed, 2 insertions(+), 2 deletions(-)
```
#### Git Commit Guidelines
We follow the [conventional commit messages](https://conventionalcommits.org/) convention in order to automate Changelog generation and auto semantic versioning based on commit messages.
* feat: A new feature
* fix: A bug fix
A commit of the type feat introduces a new feature to the codebase (this correlates with MINOR in semantic versioning).
eg:
```
feat: xxxxxxxxxx
````
A commit of the type fix patches a bug in your codebase (this correlates with PATCH in semantic versioning).
eg:
```
fix: xxxxxxxxxx
````
Commits types as `docs:`,`style:`,`refactor:`,`perf:`,`test:` and `chore:` are valid but has no effect on versioning, but, it would be great if you use them.
### 5. Rebase and Push Changes
If you have been working on your contribution for a while, the upstream repository may have changed. You may want to

@ -1,6 +1,6 @@
{
"name": "verdaccio",
"version": "2.5.1",
"version": "2.6.0",
"description": "Private npm repository server",
"author": {
"name": "Alex Kocharin",