Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 0 deletions

diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb
index 38839497fb6..d1ca16bd8fb 100644
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -43,6 +43,7 @@ class PasswordsController < Devise::PasswordsController
         resource.password_expires_at = nil
         resource.save(validate: false) if resource.changed?
       else
+        log_audit_reset_failure(@user)
         track_weak_password_error(@user, self.class.name, 'create')
       end
     end
@@ -50,6 +51,9 @@ class PasswordsController < Devise::PasswordsController
 
   protected
 
+  # overriden in EE
+  def log_audit_reset_failure(_user); end
+
   def resource_from_email
     email = resource_params[:email]
     self.resource = resource_class.find_by_email(email)