diff options
| author | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-06-27 20:46:13 +0000 |
|---|---|---|
| committer | beatrix-bitrot <beatrix.bitrot@gmail.com> | 2017-06-27 20:46:13 +0000 |
| commit | ddafde942ca53816c19b0ea0cb40bb1b46cf5668 (patch) | |
| tree | c0ac2138fe994c4c2a15c23b47d4155f75148945 /config/initializers | |
| parent | e6300de1421d28d173658e61601b9e016c3d0a6d (diff) | |
| parent | da42bfadb58888e3a18afd66395f0f3edc2fa622 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/devise.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 6d3a73ef6..d51471d30 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -1,6 +1,6 @@ Warden::Manager.after_set_user except: :fetch do |user, warden| SessionActivation.deactivate warden.raw_session['auth_id'] - warden.raw_session['auth_id'] = user.activate_session + warden.raw_session['auth_id'] = user.activate_session(warden.request) end Warden::Manager.after_fetch do |user, warden| |