Skip to content
This repository was archived by the owner on Mar 4, 2022. It is now read-only.

Commit 34d3739

Browse files
authored
Merge pull request #2 from mocks-server/release
Release v1.0.1
2 parents 4832bb3 + da8a10d commit 34d3739

File tree

8 files changed

+16
-10
lines changed

8 files changed

+16
-10
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Individuals making significant and valuable contributions are given commit-acces
3131
There are a few basic ground-rules for contributors:
3232

3333
1. **No `--force` pushes** or modifying the Git history in any way.
34-
2. **All modifications** should be subject to a **pull request** to solicit feedback from other contributors. The base branch of the pull request should correspond with the assigned "release milestone" of the related issue. When an issue is created, it will be prioritized and a "release milestone" will be assigned to it, at the criteria of contributors. A branch will be created from master for that release milestone, and all related issues should be merged into it, until is ready to declare a formal release.
34+
2. **All modifications** should be subject to a **pull request** to solicit feedback from other contributors. The base branch of the pull request should correspond with the assigned "release milestone" of the related issue. When an issue is created, it will be prioritized and a "release milestone" will be assigned to it, at the criteria of contributors. A branch will be created from `main` for that release milestone, and all related issues should be merged into it, until is ready to declare a formal release.
3535

3636
### Releases
3737

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: build
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66
- release
77
- pre-release
88
pull_request:

.github/workflows/check-package-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: check-package-version
22
on:
33
pull_request:
44
branches:
5-
- master
5+
- main
66
jobs:
77
check-package-version:
88
runs-on: ubuntu-latest

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1212
### Fixed
1313
### Removed
1414

15+
## [1.0.1] - 2021-12-05
16+
17+
### Fixed
18+
- docs: Fix main branch name in badges
19+
- chore(workflows): Fix main branch name
20+
1521
## [1.0.0] - 2021-12-05
1622

1723
### Added

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ Please read the [contributing guidelines](.github/CONTRIBUTING.md) and [code of
6969

7070
[coveralls-image]: https://coveralls.io/repos/github/mocks-server/plugin-proxy/badge.svg
7171
[coveralls-url]: https://coveralls.io/github/mocks-server/plugin-proxy
72-
[build-image]: https://github.com/mocks-server/plugin-proxy/workflows/build/badge.svg?branch=master
73-
[build-url]: https://github.com/mocks-server/plugin-proxy/actions?query=workflow%3Abuild+branch%3Amaster
72+
[build-image]: https://github.com/mocks-server/plugin-proxy/workflows/build/badge.svg?branch=main
73+
[build-url]: https://github.com/mocks-server/plugin-proxy/actions?query=workflow%3Abuild+branch%main
7474
[last-commit-image]: https://img.shields.io/github/last-commit/mocks-server/plugin-proxy.svg
7575
[last-commit-url]: https://github.com/mocks-server/plugin-proxy/commits
7676
[license-image]: https://img.shields.io/npm/l/@mocks-server/plugin-proxy.svg
77-
[license-url]: https://github.com/mocks-server/plugin-proxy/blob/master/LICENSE
77+
[license-url]: https://github.com/mocks-server/plugin-proxy/blob/main/LICENSE
7878
[npm-downloads-image]: https://img.shields.io/npm/dm/@mocks-server/plugin-proxy.svg
7979
[npm-downloads-url]: https://www.npmjs.com/package/@mocks-server/plugin-proxy
8080
[quality-gate-image]: https://sonarcloud.io/api/project_badges/measure?project=mocks-server_plugin-proxy&metric=alert_status

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mocks-server/plugin-proxy",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "Mocks Server plugin providing an http-proxy route handler",
55
"keywords": [
66
"mocks-server-plugin",

sonar-project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
sonar.organization=mocks-server
22
sonar.projectKey=mocks-server_plugin-proxy
3-
sonar.projectVersion=1.0.0
3+
sonar.projectVersion=1.0.1
44

55
sonar.javascript.file.suffixes=.js
66
sonar.sourceEncoding=UTF-8

0 commit comments

Comments
 (0)