about summary refs log tree commit diff
path: root/app/views/auth/passwords/edit.html.haml
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-08-13 23:10:19 +0200
committerGitHub <noreply@github.com>2020-08-13 23:10:19 +0200
commit6fece522f9dca9d13ae2d4437b395a92ddb106c9 (patch)
tree882f9cf298e9dffa985f214b28a877b08cf19752 /app/views/auth/passwords/edit.html.haml
parent660188c9008761ae38d0e82dea841f7d90e199f9 (diff)
parent0f71372d6337f695a87c7158c52b93e49acc215d (diff)
Merge pull request #1404 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/auth/passwords/edit.html.haml')
-rw-r--r--app/views/auth/passwords/edit.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/auth/passwords/edit.html.haml b/app/views/auth/passwords/edit.html.haml
index 383d44f00..114a74454 100644
--- a/app/views/auth/passwords/edit.html.haml
+++ b/app/views/auth/passwords/edit.html.haml
@@ -1,14 +1,14 @@
 - content_for :page_title do
   = t('auth.set_new_password')
 
-= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, novalidate: false }) do |f|
   = render 'shared/error_messages', object: resource
 
   - if !use_seamless_external_login? || resource.encrypted_password.present?
     = f.input :reset_password_token, as: :hidden
 
     .fields-group
-      = f.input :password, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off' }, required: true
+      = f.input :password, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.new_password'), :autocomplete => 'off', :minlength => User.password_length.first, :maxlength => User.password_length.last }, required: true
     .fields-group
       = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_new_password'), input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_new_password'), :autocomplete => 'off' }, required: true