From: Jeong Arm <kjwonmail@gmail.com>
Date: Sun, 30 May 2021 15:57:47 +0000 (+0900)
Subject: Remove set-cookie header on custom.css (#16314)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5ef216d032469aa38c437b57a3871d5c3d992549;p=mastodon.git

Remove set-cookie header on custom.css (#16314)

* Remove set-cookie header on custom.css

* Additional fix for set-cookie
---

diff --git a/app/controllers/custom_css_controller.rb b/app/controllers/custom_css_controller.rb
index 0a667a6a6..e1dc5eaf6 100644
--- a/app/controllers/custom_css_controller.rb
+++ b/app/controllers/custom_css_controller.rb
@@ -3,11 +3,16 @@
 class CustomCssController < ApplicationController
   skip_before_action :store_current_location
   skip_before_action :require_functional!
+  skip_before_action :update_user_sign_in
+  skip_before_action :set_session_activity
+
+  skip_around_action :set_locale
 
   before_action :set_cache_headers
 
   def show
     expires_in 3.minutes, public: true
+    request.session_options[:skip] = true
     render plain: Setting.custom_css || '', content_type: 'text/css'
   end
 end