v4.1.3 #17

Merged
asonix merged 42 commits from asonix/changes into asonix/downstream 2023-07-06 14:31:00 +00:00
2 changed files with 2 additions and 2 deletions
Showing only changes of commit 72d96bf17a - Show all commits

View file

@ -46,6 +46,6 @@ class MediaController < ApplicationController
end
def allow_iframing
response.headers['X-Frame-Options'] = 'ALLOWALL'
response.headers.delete('X-Frame-Options')
end
end

View file

@ -43,7 +43,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