Merge commit '1e5306b8203a7ebe24047910e6c690c18c6d827a' into 2fa_enforcement

This commit is contained in:
Olivier Martin
2021-04-29 23:29:28 -04:00
6 changed files with 19 additions and 11 deletions

View File

@@ -522,7 +522,7 @@ fn diagnostics(_token: AdminToken, ip_header: IpHeader, conn: DbConn) -> ApiResu
Ok(r) => r.tag_name,
_ => "-".to_string(),
},
match get_github_api::<GitCommit>("https://api.github.com/repos/dani-garcia/vaultwarden/commits/master") {
match get_github_api::<GitCommit>("https://api.github.com/repos/dani-garcia/vaultwarden/commits/main") {
Ok(mut c) => {
c.sha.truncate(8);
c.sha