diff options
author | James Lopez <james@gitlab.com> | 2018-05-07 14:26:32 +0300 |
---|---|---|
committer | James Lopez <james@gitlab.com> | 2018-05-07 14:26:32 +0300 |
commit | a61e7eaa01047d5ca290758e1f54ff82b1c60104 (patch) | |
tree | fa809f206173453f145f8a86e2dca4c82400cfe8 | |
parent | 7f7153301ad59d864791cb85d8abd1135962e954 (diff) | |
parent | 5b202030e40f41ad4d2139ba1d78f8eaf0ab469e (diff) |
Merge branch '10-8-stable-prepare-rc3' into '10-8-stable'
Prepare 10.8 RC3 release
See merge request gitlab-org/gitlab-ce!18772
-rw-r--r-- | config/initializers/warden.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/initializers/warden.rb b/config/initializers/warden.rb index bf079f8e1a7..8cc36820d3c 100644 --- a/config/initializers/warden.rb +++ b/config/initializers/warden.rb @@ -1,21 +1,21 @@ Rails.application.configure do |config| - Warden::Manager.after_set_user do |user, auth, opts| + Warden::Manager.after_set_user(scope: :user) do |user, auth, opts| Gitlab::Auth::UniqueIpsLimiter.limit_user!(user) end - Warden::Manager.before_failure do |env, opts| + Warden::Manager.before_failure(scope: :user) do |env, opts| Gitlab::Auth::BlockedUserTracker.log_if_user_blocked(env) end - Warden::Manager.after_authentication do |user, auth, opts| + Warden::Manager.after_authentication(scope: :user) do |user, auth, opts| ActiveSession.cleanup(user) end - Warden::Manager.after_set_user only: :fetch do |user, auth, opts| + Warden::Manager.after_set_user(scope: :user, only: :fetch) do |user, auth, opts| ActiveSession.set(user, auth.request) end - Warden::Manager.before_logout do |user, auth, opts| + Warden::Manager.before_logout(scope: :user) do |user, auth, opts| ActiveSession.destroy(user || auth.user, auth.request.session.id) end end |