Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 3 insertions, 0 deletions

diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb
index ead5d7c9026..1216353be36 100644
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -2,6 +2,7 @@
 
 class PasswordsController < Devise::PasswordsController
   include GitlabRecaptcha
+  include Gitlab::Tracking::Helpers::WeakPasswordErrorEvent
 
   skip_before_action :require_no_authentication, only: [:edit, :update]
 
@@ -41,6 +42,8 @@ class PasswordsController < Devise::PasswordsController
         resource.password_automatically_set = false
         resource.password_expires_at = nil
         resource.save(validate: false) if resource.changed?
+      else
+        track_weak_password_error(@user, self.class.name, 'create')
       end
     end
   end