Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 1 deletions

diff --git a/config/initializers/warden.rb b/config/initializers/warden.rb
index 88f2a13df60..4aa5941747d 100644
--- a/config/initializers/warden.rb
+++ b/config/initializers/warden.rb
@@ -21,6 +21,8 @@ Rails.application.configure do |config|
 
   Warden::Manager.after_authentication(scope: :user) do |user, auth, opts|
     ActiveSession.cleanup(user)
+    # sets marketing cookie for active user session
+    ActiveSession.set_active_user_cookie(auth) if ::Gitlab.com?
     Gitlab::AnonymousSession.new(auth.request.remote_ip).cleanup_session_per_ip_count
   end
 
@@ -34,7 +36,8 @@ Rails.application.configure do |config|
 
   Warden::Manager.before_logout(scope: :user) do |user, auth, opts|
     user ||= auth.user
-
+    # deletes marketing cookie when user session ends
+    ActiveSession.unset_active_user_cookie(auth) if ::Gitlab.com?
     # Rails CSRF protection may attempt to log out a user before that
     # user even logs in
     next unless user