logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 0d83569899155e5d5c17fff0c69e533df2f34d42
parent: 515434ed87dea56b853d41b2af2ee1fd7773ccea
Author: Eugen <eugen@zeonfederated.com>
Date:   Sat, 15 Apr 2017 22:48:30 +0200

Fix cross-origin integrity (#1871)

See <https://glitch.social/users/bea/updates/434>

Diffstat:

Mapp/views/home/index.html.haml2+-
Mapp/views/layouts/admin.html.haml2+-
Mapp/views/layouts/auth.html.haml2+-
Mapp/views/layouts/embedded.html.haml2+-
Mapp/views/layouts/public.html.haml2+-
5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml @@ -1,6 +1,6 @@ - content_for :header_tags do %script#initial-state{:type => 'application/json'}!= json_escape(render(file: 'home/initial_state', formats: :json)) - = javascript_include_tag 'application', integrity: true + = javascript_include_tag 'application', integrity: true, crossorigin: 'anonymous' = react_component 'Mastodon', default_props, class: 'app-holder', prerender: false diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml @@ -1,5 +1,5 @@ - content_for :header_tags do - = javascript_include_tag 'application_public', integrity: true + = javascript_include_tag 'application_public', integrity: true, crossorigin: 'anonymous' - content_for :content do .admin-wrapper diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml @@ -1,5 +1,5 @@ - content_for :header_tags do - = javascript_include_tag 'application_public', integrity: true + = javascript_include_tag 'application_public', integrity: true, crossorigin: 'anonymous' - content_for :content do .container diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml @@ -3,6 +3,6 @@ %head %meta{:charset => 'utf-8'}/ = stylesheet_link_tag 'application', media: 'all' - = javascript_include_tag 'application_public', integrity: true + = javascript_include_tag 'application_public', integrity: true, crossorigin: 'anonymous' %body.embed = yield diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml @@ -1,5 +1,5 @@ - content_for :header_tags do - = javascript_include_tag 'application_public', integrity: true + = javascript_include_tag 'application_public', integrity: true, crossorigin: 'anonymous' - content_for :content do .container= yield