diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-08 19:48:03 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-08 19:48:03 +0000 |
| commit | d74e93ce46f1ca3f23e5011138f77ad64e316d11 (patch) | |
| tree | a3ec01f0b1c513f9660ba9d2b9e72e1d4dc99440 | |
| parent | ff5284b632779ffaa45de3dea2b6650e5065fae7 (diff) | |
| parent | 57a3f2845653da1926ea38c061db0b9b08b2902a (diff) | |
| download | gitlab-ce-d74e93ce46f1ca3f23e5011138f77ad64e316d11.tar.gz | |
Merge branch 'password-min-length-placeholder' into 'master'
Added minimum password length to password field
Add a placeholder to the password field in the register form with the minimum number of characters required. Also added a pattern to the field to stop it submitting if less than that.
Closes #17765
See merge request !4458
| -rw-r--r-- | app/controllers/sessions_controller.rb | 1 | ||||
| -rw-r--r-- | app/views/devise/shared/_signup_box.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index f6eedb1773c..dae8f7b1447 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -14,6 +14,7 @@ class SessionsController < Devise::SessionsController before_action :load_recaptcha def new + set_minimum_password_length if Gitlab.config.ldap.enabled @ldap_servers = Gitlab::LDAP::Config.servers else diff --git a/app/views/devise/shared/_signup_box.html.haml b/app/views/devise/shared/_signup_box.html.haml index 510215bb8cd..905a8dbcd84 100644 --- a/app/views/devise/shared/_signup_box.html.haml +++ b/app/views/devise/shared/_signup_box.html.haml @@ -16,7 +16,7 @@ %div = f.email_field :email, class: "form-control middle", placeholder: "Email", required: true .form-group.append-bottom-20#password-strength - = f.password_field :password, class: "form-control bottom", placeholder: "Password", required: true + = f.password_field :password, class: "form-control bottom", placeholder: "Password - minimum length #{@minimum_password_length} characters", required: true, pattern: ".{#{@minimum_password_length},}", title: "Minimum length is #{@minimum_password_length} characters" %div - if current_application_settings.recaptcha_enabled = recaptcha_tags |