Skip to content

Commit

Permalink
Merge branch 'TeamHarTex:nightly' into nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
HTGAzureX1212 authored Dec 3, 2023
2 parents 224f75c + 5c187b3 commit 2128129
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
5 changes: 3 additions & 2 deletions bors/Cargo.lock

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

2 changes: 1 addition & 1 deletion bors/hartex-bors-github/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ hartex_log = { path = "../../rust-utilities/hartex-log" }
futures = "0.3.29"
http = "0.2.11"
http-body = "0.4.5"
jsonwebtoken = "9.1.0"
jsonwebtoken = "9.2.0"
miette = "5.10.0"
octocrab = "0.32.0"
secrecy = "0.8.0"
Expand Down
2 changes: 1 addition & 1 deletion bors/hartex-bors-website/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ hartex_bors_database = { path = "../hartex-bors-database" }

hartex_log = { path = "../../rust-utilities/hartex-log" }

async-lock = "3.1.2"
async-lock = "3.2.0"
handlebars = { version = "5.0.0-beta.5", features = ["dir_source"] }
miette = { version = "5.10.0", features = ["fancy"] }
rocket = { git = "https://github.com/SergioBenitez/Rocket.git", branch = "master" }
Expand Down
12 changes: 6 additions & 6 deletions web-frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -585,9 +585,9 @@
gsap "^3.12.2"

"@iconify-json/carbon@^1.1.19":
version "1.1.23"
resolved "https://registry.yarnpkg.com/@iconify-json/carbon/-/carbon-1.1.23.tgz#2397374e4e8626173915244be58d4ae9d83a5eef"
integrity sha512-Ue+IRSxCBt28KEM7nf0XeMqedxhK9ku8KtTnb8H3TM+QOMMBG8VnralEH0RnV11gzrhAadoMeeeRQ9Oey8TqlQ==
version "1.1.24"
resolved "https://registry.yarnpkg.com/@iconify-json/carbon/-/carbon-1.1.24.tgz#a473f073a16f3bfd91c1212403db8df40cc5ea68"
integrity sha512-Sx4vj3HfQj3yP6a4QzWc1BymDO5uTOGTHeb5it/xaMa196C6+RegNUv1F+Y1h8AJ2Sv93GMI+PyMH0HyqTHEmg==
dependencies:
"@iconify/types" "*"

Expand Down Expand Up @@ -1471,9 +1471,9 @@
integrity sha512-AuHIyzR5Hea7ij0P9q7vx7xu4z0C28ucwjAZC0ja7JhINyCnOw8/DnvAPQQ9TfOlCtZAmCERKQX9+o1mgQhuOQ==

"@types/node@*", "@types/node@^20.0.0":
version "20.10.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.1.tgz#d2c96f356c3125fedc983d74c424910c3767141c"
integrity sha512-T2qwhjWwGH81vUEx4EXmBKsTJRXFXNZTL4v0gi01+zyBmCwzE6TyHszqX01m+QHTEq+EZNo13NeJIdEqf+Myrg==
version "20.10.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.2.tgz#32a5e8228357f57714ad28d52229ab04880c2814"
integrity sha512-37MXfxkb0vuIlRKHNxwCkb60PNBpR94u4efQuN4JgIAm66zfCDXGSAFCef9XUWFovX2R1ok6Z7MHhtdVXXkkIw==
dependencies:
undici-types "~5.26.4"

Expand Down

0 comments on commit 2128129

Please sign in to comment.