Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mm/fix_auth' into 'master'

Browse Source 
Mm/fix auth

See merge request veloren/veloren!4109
This commit is contained in:
Marcel 2023-09-13 10:25:00 +00:00
commit 93fc044b03
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -388,7 +388,7 @@ dependencies = [
[[package]]
name = "auth-common"
version = "0.1.0"
source = "git+https://gitlab.com/veloren/auth.git?rev=edd69ed70aea81be87cfaa9f2b8e2b40f51da649#edd69ed70aea81be87cfaa9f2b8e2b40f51da649"
source = "git+https://gitlab.com/veloren/auth.git?rev=abb1a705827984e11706d7bb97fb7a459e1e6533#abb1a705827984e11706d7bb97fb7a459e1e6533"
dependencies = [
"rand 0.8.5",
"serde",
@ -398,7 +398,7 @@ dependencies = [
[[package]]
name = "authc"
version = "1.0.0"
source = "git+https://gitlab.com/veloren/auth.git?rev=edd69ed70aea81be87cfaa9f2b8e2b40f51da649#edd69ed70aea81be87cfaa9f2b8e2b40f51da649"
source = "git+https://gitlab.com/veloren/auth.git?rev=abb1a705827984e11706d7bb97fb7a459e1e6533#abb1a705827984e11706d7bb97fb7a459e1e6533"
dependencies = [
"auth-common",
"fxhash",

2
client/Cargo.toml
View File

@ -31,7 +31,7 @@ rayon = { workspace = true }
specs = { workspace = true, features = ["serde", "storage-event-control", "derive"] }
vek = { workspace = true }
hashbrown = { workspace = true }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "edd69ed70aea81be87cfaa9f2b8e2b40f51da649" } # xMAC94x/current_master_till_refactored branch
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "abb1a705827984e11706d7bb97fb7a459e1e6533" } # xMAC94x/current_master_till_refactored branch
#TODO: put bot in a different crate
#bot only

2
server/Cargo.toml
View File

@ -60,7 +60,7 @@ rayon = { workspace = true }
crossbeam-channel = { workspace = true }
prometheus = { workspace = true }
portpicker = { git = "https://github.com/xMAC94x/portpicker-rs", rev = "df6b37872f3586ac3b21d08b56c8ec7cd92fb172" }
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "edd69ed70aea81be87cfaa9f2b8e2b40f51da649" } # xMAC94x/current_master_till_refactored branch
authc = { git = "https://gitlab.com/veloren/auth.git", rev = "abb1a705827984e11706d7bb97fb7a459e1e6533" } # xMAC94x/current_master_till_refactored branch
slab = "0.4"
rand_distr = "0.4.0"
enumset = "1.0.8"