diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-08-01 14:23:06 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-08-01 14:23:06 +0200 |
| commit | 4bcf72e734fbafe99ec603d34819b8ab68bf390c (patch) | |
| tree | 1c293c3ea6a51fb752335b8f5624593511444e1b /config | |
| parent | e9d04585f872121d4b1f96e019946cfa48d2f915 (diff) | |
| download | gitlab-ce-4bcf72e734fbafe99ec603d34819b8ab68bf390c.tar.gz | |
Improve blocked user tracking and fire some events only once
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/warden.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/initializers/warden.rb b/config/initializers/warden.rb index d64b659c6d7..872e82c4df2 100644 --- a/config/initializers/warden.rb +++ b/config/initializers/warden.rb @@ -35,7 +35,11 @@ Rails.application.configure do |config| Warden::Manager.before_logout(scope: :user) do |user_warden, auth, opts| user = user_warden || auth.user + Gitlab::Auth::Activity.new(user, opts).tap do |activity| + activity.user_blocked! if user.blocked? + activity.user_session_destroyed! + end + ActiveSession.destroy(user, auth.request.session.id) - Gitlab::Auth::Activity.new(user, opts).user_session_destroyed! end end |