summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-10-02 18:10:01 +0000
committerRobert Speicher <robert@gitlab.com>2017-10-02 18:10:01 +0000
commit4d5ea927d6e3a91c1b89f8978dbd5fb67e723452 (patch)
treeb7015d9c08236bbd7f84c1c8d6e73650594de4a3 /app/models/user.rb
parent95f613837dca391a77eed9f948326b982c77d723 (diff)
parent7dac9624bc19019f7432cf12ac8713a5dad03b69 (diff)
downloadgitlab-ce-4d5ea927d6e3a91c1b89f8978dbd5fb67e723452.tar.gz
Merge branch 'enhance-logging' into 'master'
Improved file logging for authentication events See merge request gitlab-org/gitlab-ce!9196
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index e5f345e93ae..4e71a3e11c2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1067,6 +1067,12 @@ class User < ActiveRecord::Base
user_synced_attributes_metadata&.read_only?(attribute)
end
+ # override, from Devise
+ def lock_access!
+ Gitlab::AppLogger.info("Account Locked: username=#{username}")
+ super
+ end
+
protected
# override, from Devise::Validatable