# This is a combination of 1 commit.

# This is the 1st commit message:
Add logging for all web authentication events

# This is the commit message #2:

Re-add underscore to after_inactive_sign_up_path_for

# This is the commit message #3:

Standardize on username=

# This is the commit message #4:

after_filter -> after_action, _resource -> resource

# This is the commit message #5:

Add two-factor login failures and account lockouts

# This is the commit message #6:

Move logging from two-factor concern to user model

# This is the commit message #7:

Add spaces around default parameter assignments

# This is the commit message #8:

Move logs out of user model

# This is the commit message #9:

Replace filtered_params with user_params

# This is the commit message #10:

Standardize case

# This is the commit message #1:

Fixes for username and AppLogger.info

1 files changed, 6 insertions, 0 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 09c9b3250eb..9fc6d2806c3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1069,6 +1069,12 @@ class User < ActiveRecord::Base
     super
   end
 
+  # override, from Devise
+  def lock_access!
+    Gitlab::AppLogger.info("Account Locked: username=#{username} reason=invalid_login_attempts")
+    super
+  end
+
   private
 
   def ci_projects_union