Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sri #1233

Merged
merged 3 commits into from
Aug 9, 2017
Merged

Add sri #1233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9b2d32
Upgrade to sprockets-rails 3.2
h-lame May 17, 2017
d53468f
Add SRI attributes to javascript and stylesheets
h-lame May 17, 2017
efa6395
Use new 1.0.1 version of shared_mustache
h-lame May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gem 'rails-i18n', '~> 4.0.0'
gem 'sass', '~> 3.4.0'
gem 'sass-rails'
gem 'slimmer', '~> 10.1.3'
gem 'sprockets-rails', "~> 2.3.0" # version 3.2 available, but breaks a test.
gem 'sprockets-rails', "~> 3.2.0"
gem 'shared_mustache', '~> 1.0.0'
gem 'statsd-ruby', '1.3.0', require: 'statsd'
gem "therubyracer", "~> 0.12.0"
Expand Down
14 changes: 7 additions & 7 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ GEM
mocha (1.2.1)
metaclass (~> 0.0.1)
multi_json (1.12.1)
mustache (1.0.3)
mustache (1.0.5)
netrc (0.11.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
Expand Down Expand Up @@ -235,7 +235,7 @@ GEM
scss_lint (0.51.0)
rake (>= 0.9, < 13)
sass (~> 3.4.20)
shared_mustache (1.0.0)
shared_mustache (1.0.1)
execjs (>= 1.2.4)
mustache (~> 1.0.2)
shoulda-context (1.2.2)
Expand All @@ -258,10 +258,10 @@ GEM
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
statsd-ruby (1.3.0)
test-unit (3.2.3)
power_assert
Expand Down Expand Up @@ -335,7 +335,7 @@ DEPENDENCIES
simplecov
simplecov-rcov
slimmer (~> 10.1.3)
sprockets-rails (~> 2.3.0)
sprockets-rails (~> 3.2.0)
statsd-ruby (= 1.3.0)
therubyracer (~> 0.12.0)
timecop
Expand Down
2 changes: 1 addition & 1 deletion app/views/help/tour.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,5 +145,5 @@
<% content_for :body_classes do %>full-width<% end %>

<% content_for :extra_javascript do %>
<%= javascript_include_tag 'tour.js', :defer => 'defer' %>
<%= javascript_include_tag 'tour.js', :defer => 'defer', integrity: true, crossorigin: 'anonymous' %>
<% end %>
4 changes: 2 additions & 2 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

<link title="Search" rel="search" type="application/opensearchdescription+xml" href="/search/opensearch.xml"/>

<!--[if gt IE 8]><!--><%= stylesheet_link_tag "application.css" %><!--<![endif]-->
<!--[if gt IE 8]><!--><%= stylesheet_link_tag "application.css", integrity: true, crossorigin: 'anonymous' %><!--<![endif]-->
<!--[if IE 6]><%= stylesheet_link_tag "application-ie6.css" %><![endif]-->
<!--[if IE 7]><%= stylesheet_link_tag "application-ie7.css" %><![endif]-->
<!--[if IE 8]><%= stylesheet_link_tag "application-ie8.css" %><![endif]-->
<%= javascript_include_tag 'frontend.js' %>
<%= javascript_include_tag 'frontend.js', integrity: true, crossorigin: 'anonymous' %>
<%= yield :extra_javascript %>
<%= yield :extra_headers %>
<% if @content_item %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/travel_advice/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% content_for :extra_headers do %>
<%= javascript_include_tag "views/travel-advice.js" %>
<%= javascript_include_tag "views/travel-advice.js", integrity: true, crossorigin: 'anonymous' %>
<%= auto_discovery_link_tag :atom, travel_advice_path(:format => :atom), :title => "Recent updates" %>
<% end %>

Expand Down