diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-31 16:49:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 16:49:48 +0200 |
| commit | 02dffa8edd097014578774aed30249ed08d2f3a4 (patch) | |
| tree | 639cb699c8fd680ba604486126211d5755b10060 /app/controllers/custom_css_controller.rb | |
| parent | bbc9ca5d38c342f3afa87835f86cdbe82a9affdb (diff) | |
| parent | fb8c5979b40441814b41f06cc4d2c4d3f1a046f9 (diff) | |
Merge pull request #1546 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/custom_css_controller.rb')
| -rw-r--r-- | app/controllers/custom_css_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
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 |