diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-06-08 22:48:03 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-06-08 22:48:03 +0300 |
| commit | d74e93ce46f1ca3f23e5011138f77ad64e316d11 (patch) | |
| tree | a3ec01f0b1c513f9660ba9d2b9e72e1d4dc99440 /app/controllers/sessions_controller.rb | |
| parent | ff5284b632779ffaa45de3dea2b6650e5065fae7 (diff) | |
| parent | 57a3f2845653da1926ea38c061db0b9b08b2902a (diff) | |
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
Diffstat (limited to 'app/controllers/sessions_controller.rb')
| -rw-r--r-- | app/controllers/sessions_controller.rb | 1 |
1 files changed, 1 insertions, 0 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 |