allows login using username or email

2017-06-12 17:26:38 +02:00
parent 62071c50e0
commit 3f11dbe1d5
7 changed files with 31 additions and 5 deletions
--- a/config/locales/activerecord.en.yml
+++ b/config/locales/activerecord.en.yml
@@ -113,6 +113,7 @@ en:
        description: "Description"
        terms_of_service: "Terms of service"
      user:
+        login: "Email or username"
        email: "Email"
        username: "Username"
        password_confirmation: "Password confirmation"