Fix rebase issues

FAForever · Dec 2, 2023 · 7ae3acd · 7ae3acd
1 parent 0db725d
commit 7ae3acd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -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
@@ -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