summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-07-19 10:34:58 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-07-19 10:34:58 +0200
commitac4b954c5fabbfa98fb72d88526a30713a20af5d (patch)
treea1fccb6ca951e96374e54872b548f160decd034b /config
parent416076610e7b1674669ad33bae604155f55a3d02 (diff)
downloadgitlab-ce-ac4b954c5fabbfa98fb72d88526a30713a20af5d.tar.gz
Rename authentication activity observer methods
Diffstat (limited to 'config')
-rw-r--r--config/initializers/warden.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/warden.rb b/config/initializers/warden.rb
index c75a76a3118..450564be1a3 100644
--- a/config/initializers/warden.rb
+++ b/config/initializers/warden.rb
@@ -22,12 +22,12 @@ Rails.application.configure do |config|
end
Warden::Manager.after_set_user(scope: :user, only: :set_user) do |user, auth, opts|
- Gitlab::Auth::Activity.new(opts).user_set_manually!
+ Gitlab::Auth::Activity.new(opts).user_session_override!
end
Warden::Manager.before_logout(scope: :user) do |user, auth, opts|
ActiveSession.destroy(user || auth.user, auth.request.session.id)
- Gitlab::Auth::Activity.new(opts).user_logout!
+ Gitlab::Auth::Activity.new(opts).user_signed_out!
end
end