Skip to content

Commit 4f145bb

Browse files
committed
Merge remote-tracking branch 'origin/main' into increase-push-action-test-coverage
2 parents 71748c7 + a3834ab commit 4f145bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1821
-658
lines changed

.husky/commit-msg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
#!/usr/bin/env sh
2-
. "$(dirname -- "$0")/_/husky.sh"
3-
41
npx --no -- commitlint --edit ${1} && npm run lint

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<a href="https://github.com/finos/git-proxy">
44
<img src="./docs/img/logo.png" alt="Logo" height="95">
55
</a>
6-
6+
77
<br />
88
<br />
9-
9+
1010
<p align="center">
1111
Deploy custom push protections and policies<br />on top of Git
1212
<br />

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@finos/git-proxy",
3-
"version": "1.17.0",
3+
"version": "1.17.1",
44
"description": "Deploy custom push protections and policies on top of Git.",
55
"scripts": {
66
"cli": "node ./packages/git-proxy-cli/index.js",
@@ -19,7 +19,7 @@
1919
"prepare": "node ./scripts/prepare.js",
2020
"lint": "eslint \"src/**/*.{js,jsx,ts,tsx,json}\" \"test/**/*.{js,jsx,ts,tsx,json}\"",
2121
"lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx,json}\" \"test/**/*.{js,jsx,ts,tsx,json}\"",
22-
"format": "prettier --write src/**/*.{js,jsx,ts,tsx,css,md,json,scss} test/**/*.{js,jsx,ts,tsx,json} --config ./.prettierrc",
22+
"format": "prettier --write src/**/*.{js,jsx,ts,tsx,css,md,json,scss} test/**/*.{js,jsx,ts,tsx,json} packages/git-proxy-cli/test/**/*.{js,jsx,ts,tsx,json} packages/git-proxy-cli/index.js --config ./.prettierrc",
2323
"gen-schema-doc": "node ./scripts/doc-schema.js",
2424
"cypress:run": "cypress run"
2525
},

packages/git-proxy-cli/test/testCli.proxy.config.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"tempPassword": {
33
"sendEmail": false,
4-
"emailConfig": {
5-
}
4+
"emailConfig": {}
65
},
76
"authorisedList": [
87
{
@@ -22,9 +21,9 @@
2221
{
2322
"type": "mongo",
2423
"connectionString": "mongodb://localhost:27017/gitproxy",
25-
"options": {
24+
"options": {
2625
"useUnifiedTopology": true
27-
},
26+
},
2827
"enabled": false
2928
}
3029
],

0 commit comments

Comments
 (0)