Merge branch 'main' into glitch-soc/merge-upstream

2021-05-31 11:53:57 +02:00
parent bbc9ca5d38 5ef216d032
commit fb8c5979b4
5 changed files with 69 additions and 25 deletions
--- 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