From 7ae3acda71f008b6410d656d5268082ae7cb42e6 Mon Sep 17 00:00:00 2001
From: Sheikah45 <Sheikah450@gmail.com>
Date: Sat, 2 Dec 2023 12:09:19 -0500
Subject: [PATCH] Fix rebase issues

---
 .../userservice/ui/view/registration/RegisterView.kt  |  2 +-
 src/main/resources/application.yaml                   | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/com/faforever/userservice/ui/view/registration/RegisterView.kt b/src/main/kotlin/com/faforever/userservice/ui/view/registration/RegisterView.kt
index 69440c1..ec0fef8 100644
--- a/src/main/kotlin/com/faforever/userservice/ui/view/registration/RegisterView.kt
+++ b/src/main/kotlin/com/faforever/userservice/ui/view/registration/RegisterView.kt
@@ -123,7 +123,7 @@ class RegisterView(private val registrationService: RegistrationService, fafProp
             .withValidator(
                 { email -> registrationService.emailAvailable(email) == EmailStatus.EMAIL_AVAILABLE },
                 getTranslation("register.email.taken"),
-        ).bind("email")
+            ).bind("email")
 
         binder.forField(termsOfService).asRequired(getTranslation("register.acknowledge.terms")).bind("termsOfService")
 
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index c91ec08..b405706 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -35,17 +35,16 @@ faf:
   irc:
     secret: ${IRC_SECRET:banana}
     token-ttl: ${IRC_TOKEN_TTL:300}
+  security:
+    failed-login-account-threshold: ${FAILED_LOGIN_ACCOUNT_THRESHOLD:5}
+    failed-login-attempt-threshold: ${FAILED_LOGIN_ATTEMPT_THRESHOLD:10}
+    failed-login-throttling-minutes: ${FAILED_LOGIN_THROTTLING_MINUTES:5}
+    failed-login-days-to-check: ${FAILED_LOGIN_DAYS_TO_CHECK:1}
 
 mailjet:
   api-key: ${MAILJET_API_KEY}
   api-secret: ${MAILJET_API_SECRET}
 
-security:
-  failed-login-account-threshold: ${FAILED_LOGIN_ACCOUNT_THRESHOLD:5}
-  failed-login-attempt-threshold: ${FAILED_LOGIN_ATTEMPT_THRESHOLD:10}
-  failed-login-throttling-minutes: ${FAILED_LOGIN_THROTTLING_MINUTES:5}
-  failed-login-days-to-check: ${FAILED_LOGIN_DAYS_TO_CHECK:1}
-
 quarkus:
   log:
     level: INFO