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

Merge branch 'password-min-length-placeholder' into 'master'
d74e93ce · Robert Speicher · ff5284b6 · 57a3f284 · d74e93ce · d74e93ce
Commit d74e93ce authored Jun 08, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sessions_controller.rb app/controllers/sessions_controller.rb +1 -0

_signup_box.html.haml app/views/devise/shared/_signup_box.html.haml +1 -1

No files found.
--- 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

--- 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