about summary refs log tree commit diff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-06-07 22:15:44 +0200
committerGitHub <noreply@github.com>2019-06-07 22:15:44 +0200
commit11c28abcfebcf8827f99a86540076347f1a1edff (patch)
treeb5d615001967cf102e88fac86b8ddb3227600109 /app/controllers/application_controller.rb
parent83600198961cce9bfe82cf0f0c33286703bc86d1 (diff)
parentaec3fa35fda50e7f618dcf8b8f14e78a995583f4 (diff)
Merge pull request #1097 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5401b9d59..333082f68 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -228,11 +228,6 @@ class ApplicationController < ActionController::Base
   end
 
   def mark_cacheable!
-    skip_session!
     expires_in 0, public: true
   end
-
-  def skip_session!
-    request.session_options[:skip] = true
-  end
 end