mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct spelling of occurred (#3222)

Browse source 
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
Georg 2024-11-19 00:37:51 +00:00 committed by GitHub
parent 9c49c831c1
commit 77e13b817a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/core/templates/unrecoverable_error.html
View file

@ -8,7 +8,7 @@
(% block body %) (% block body %)
<h2>Error</h2> <h2>Error</h2>
<main id="main"> <main id="main">
<p>An unrecoverable error occured. Please contact your administrator with the details below.</p> <p>An unrecoverable error occurred. Please contact your administrator with the details below.</p>
<p>Error Code: (( err_code ))</p> <p>Error Code: (( err_code ))</p>
<p>Operation ID: (( operation_id ))</p> <p>Operation ID: (( operation_id ))</p>
</main> </main>

2
server/lib/src/server/migrations.rs
View file

@ -179,7 +179,7 @@ impl QueryServer {
// Execute whatever operations we have batched up and ready to go. This is needed // Execute whatever operations we have batched up and ready to go. This is needed
// to preserve ordering of the operations - if we reloaded after a remigrate then // to preserve ordering of the operations - if we reloaded after a remigrate then
// we would have skipped the patch level fix which needs to have occured *first*. // we would have skipped the patch level fix which needs to have occurred *first*.
if reload_required { if reload_required {
write_txn.reload()?; write_txn.reload()?;
// We are not yet at the schema phase where reindexes will auto-trigger // We are not yet at the schema phase where reindexes will auto-trigger