fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-26 07:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implementing Subresource Integrity (#1729)

Browse source 
* Add sprockets-rails to Gemfile

* Add sprockets-rails to Gemfile.lock

* Update show.html.haml

* Update index.html.haml

* Update admin.html.haml

* Update auth.html.haml

* Update embedded.html.haml

* Update public.html.haml
This commit is contained in:
maxypy 2017-04-14 11:09:20 +02:00 committed by Eugen
parent 4445ebdad2
commit a6807201d2
8 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -50,6 +50,7 @@ gem 'sidekiq'
gem 'sidekiq-unique-jobs'
gem 'simple-navigation'
gem 'simple_form'
gem 'sprockets-rails', :require => 'sprockets/railtie'
gem 'statsd-instrument'
gem 'twitter-text'
gem 'tzinfo-data'

1
Gemfile.lock
View file

@ -520,6 +520,7 @@ DEPENDENCIES
simple-navigation
simple_form
simplecov
sprockets-rails
statsd-instrument
twitter-text
tzinfo-data

2
app/views/about/show.html.haml
View file

@ -1,5 +1,5 @@
- content_for :header_tags do
= javascript_include_tag 'application_public'
= javascript_include_tag 'application_public', integrity: true
- content_for :page_title do
= Rails.configuration.x.local_domain

2
app/views/home/index.html.haml
View file

@ -3,6 +3,6 @@
window.STREAMING_API_BASE_URL = '#{Rails.configuration.x.streaming_api_base_url}';
window.INITIAL_STATE = #{json_escape(render(file: 'home/initial_state', formats: :json))}
= javascript_include_tag 'application'
= javascript_include_tag 'application', integrity: true
= react_component 'Mastodon', default_props, class: 'app-holder', prerender: false

2
app/views/layouts/admin.html.haml
View file

@ -1,5 +1,5 @@
- content_for :header_tags do
= javascript_include_tag 'application_public'
= javascript_include_tag 'application_public', integrity: true
- content_for :content do
.admin-wrapper

2
app/views/layouts/auth.html.haml
View file

@ -1,5 +1,5 @@
- content_for :header_tags do
= javascript_include_tag 'application_public'
= javascript_include_tag 'application_public', integrity: true
- content_for :content do
.container

2
app/views/layouts/embedded.html.haml
View file

@ -3,6 +3,6 @@
%head
%meta{:charset => 'utf-8'}/
= stylesheet_link_tag 'application', media: 'all'
= javascript_include_tag 'application_public'
= javascript_include_tag 'application_public', integrity: true
%body.embed
= yield

2
app/views/layouts/public.html.haml
View file

@ -1,5 +1,5 @@
- content_for :header_tags do
= javascript_include_tag 'application_public'
= javascript_include_tag 'application_public', integrity: true
- content_for :content do
.container= yield