Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 0 deletions

diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb
index 09f91d036d0..738c41207d5 100644
--- a/app/controllers/profiles/passwords_controller.rb
+++ b/app/controllers/profiles/passwords_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Profiles::PasswordsController < Profiles::ApplicationController
+  include Gitlab::Tracking::Helpers::WeakPasswordErrorEvent
+
   skip_before_action :check_password_expiration, only: [:new, :create]
   skip_before_action :check_two_factor_requirement, only: [:new, :create]
 
@@ -27,6 +29,7 @@ class Profiles::PasswordsController < Profiles::ApplicationController
 
       redirect_to root_path, notice: _('Password successfully changed')
     else
+      track_weak_password_error(@user, self.class.name, 'create')
       render :new
     end
   end
@@ -48,6 +51,7 @@ class Profiles::PasswordsController < Profiles::ApplicationController
       flash[:notice] = _('Password was successfully updated. Please sign in again.')
       redirect_to new_user_session_path
     else
+      track_weak_password_error(@user, self.class.name, 'update')
       @user.reset
       render 'edit'
     end