From 35f4d61d112dde19d1ffee0aa48f89bbb0a1e516 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 26 Mar 2017 00:29:23 +0100 Subject: [PATCH] Disable rack session cookie for sidekiq Since 4.2.3 sidekiq allows to disable its own session cookie for the case where the app provides a session already. closes #7395 --- Changelog.md | 1 + config/routes.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 9931e37cc..3247122c7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -13,6 +13,7 @@ * Disable autocomplete for the conversation form recipient input [#7375](https://github.com/diaspora/diaspora/pull/7375) * Fix sharing indicator on profile page for blocked users [#7382](https://github.com/diaspora/diaspora/pull/7382) * Remove post only after a successful deletion on the server [#7385](https://github.com/diaspora/diaspora/pull/7385) +* Fix an issue where pod admins could get logged out when using sidekiq-web [#7395](https://github.com/diaspora/diaspora/pull/7395) ## Features * Add links to liked and commented pages [#5502](https://github.com/diaspora/diaspora/pull/5502) diff --git a/config/routes.rb b/config/routes.rb index 288733244..2064f4475 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,8 +2,9 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require 'sidekiq/web' +require "sidekiq/web" require "sidekiq/cron/web" +Sidekiq::Web.set :sessions, false # disable rack session cookie Diaspora::Application.routes.draw do