Merge commit 'b896b16cb3' into glitch-soc/merge-upstream

This commit is contained in:
Claire 2023-05-28 15:01:53 +02:00
commit 6dbd44faea
40 changed files with 227 additions and 216 deletions

View file

@ -46,7 +46,7 @@ class StatusesController < ApplicationController
return not_found if @status.hidden? || @status.reblog?
expires_in 180, public: true
response.headers['X-Frame-Options'] = 'ALLOWALL'
response.headers.delete('X-Frame-Options')
render layout: 'embedded'
end