Skip to content

Commit 2d4026e

Browse files
committed
Merge branch 'master' into permissions_rework
Relocked flowauth Pipfile and package-lock
2 parents 248e240 + 3678d82 commit 2d4026e

32 files changed

+3740
-2656
lines changed

.github/dependabot.yml

+2
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ updates:
141141
pull-request-branch-name:
142142
separator: "-"
143143
open-pull-requests-limit: 10
144+
ignore:
145+
- dependency-name: "apache-airflow" # Airflow package version needs to stay in sync with Airflow docker image version
144146
labels:
145147
- FlowETL
146148
- package-ecosystem: pip

autoflow/Pipfile.lock

+569-551
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deployment/Pipfile.lock

+4-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/Pipfile.lock

+546-419
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flowapi/Pipfile.lock

+80-71
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flowauth/Pipfile.lock

+65-64
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flowauth/frontend/package-lock.json

+14-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flowauth/frontend/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"react-dom": "^17.0.2",
1616
"react-qr-svg": "^2.4.0",
1717
"react-scripts": "^4.0.3",
18-
"rsuite": "^5.23.1",
18+
"rsuite": "^5.23.3",
1919
"zxcvbn": "^4.4.2"
2020
},
2121
"homepage": "http://site.com/static",
@@ -29,7 +29,7 @@
2929
"cy:verify": "cypress verify"
3030
},
3131
"devDependencies": {
32-
"cypress": "^12.0.2",
32+
"cypress": "^12.2.0",
3333
"husky": "^8.0.2",
3434
"otp-cli": "^0.2.0",
3535
"prettier": "^2.8.1",

0 commit comments

Comments
 (0)