Implementing Subresource Integrity (#1729)

* 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
master
maxypy 8 years ago committed by Eugen
parent 4445ebdad2
commit a6807201d2
  1. 1
      Gemfile
  2. 1
      Gemfile.lock
  3. 2
      app/views/about/show.html.haml
  4. 2
      app/views/home/index.html.haml
  5. 2
      app/views/layouts/admin.html.haml
  6. 2
      app/views/layouts/auth.html.haml
  7. 2
      app/views/layouts/embedded.html.haml
  8. 2
      app/views/layouts/public.html.haml

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

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

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

@ -3,6 +3,6 @@
window.STREAMING_API_BASE_URL = '#{Rails.configuration.x.streaming_api_base_url}'; window.STREAMING_API_BASE_URL = '#{Rails.configuration.x.streaming_api_base_url}';
window.INITIAL_STATE = #{json_escape(render(file: 'home/initial_state', formats: :json))} 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 = react_component 'Mastodon', default_props, class: 'app-holder', prerender: false

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

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

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

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

Loading…
Cancel
Save