diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-10 10:52:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 10:52:18 +0200 |
| commit | e6647ccf6d13030a91c7e635526e1e40a059ce31 (patch) | |
| tree | eda07c40c934ab9a55d7847afe4af3e54bce86b8 /app/controllers/statuses_controller.rb | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 402da8065c2b378cca6361f2c7252bd766f25dde (diff) | |
Merge pull request #557 from ThibG/glitch-soc/tentative-merge
Merge upstream changes
Diffstat (limited to 'app/controllers/statuses_controller.rb')
| -rw-r--r-- | app/controllers/statuses_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 2e9cf14e0..f4ac1d03b 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -48,7 +48,12 @@ class StatusesController < ApplicationController def embed use_pack 'embed' + raise ActiveRecord::RecordNotFound if @status.hidden? + + skip_session! + expires_in 180, public: true response.headers['X-Frame-Options'] = 'ALLOWALL' + render 'stream_entries/embed', layout: 'embedded' end |