diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-03 23:29:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 23:29:41 +0200 |
| commit | 75b0fa8b760b8829b933b249ac48965abdab15ae (patch) | |
| tree | 4b2e5293f15972012c4dc876bb66870d692490d0 /app/controllers/statuses_controller.rb | |
| parent | 9c61dadc0db7009853c6b2345a02c3b219022929 (diff) | |
| parent | 89fcd68b7501f81a3e33f6b1abff6fc66f78e04b (diff) | |
Merge pull request #1324 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/statuses_controller.rb')
| -rw-r--r-- | app/controllers/statuses_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 588063d01..a1b7f4320 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -49,7 +49,7 @@ class StatusesController < ApplicationController def embed use_pack 'embed' - return not_found if @status.hidden? + return not_found if @status.hidden? || @status.reblog? expires_in 180, public: true response.headers['X-Frame-Options'] = 'ALLOWALL' |