Merge branch 'main' into switch-to-db-d

This commit is contained in:
Juan Font
2022-08-11 13:11:38 +02:00
committed by GitHub
16 changed files with 190 additions and 39 deletions

View File

@@ -474,7 +474,11 @@ func (h *Headscale) validateMachineForOIDCCallback(
Caller().
Err(err).
Msg("Failed to refresh machine")
http.Error(writer, "Failed to refresh machine", http.StatusInternalServerError)
http.Error(
writer,
"Failed to refresh machine",
http.StatusInternalServerError,
)
return nil, true, err
}