Merge branch 'patch-2' of github.com:dee-see/letter_opener_web into next

Conflicts: app/views/layouts/letter_opener_web/_javascripts.html.erb
fgrehm · Oct 20, 2021 · 1a4a504 · 1a4a504
2 parents 13565e3 + c535f35
commit 1a4a504
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 554 deletions.
diff --git a/app/views/layouts/letter_opener_web/_javascripts.html.erb b/app/views/layouts/letter_opener_web/_javascripts.html.erb
@@ -1,7 +1,7 @@
 <%= render "layouts/letter_opener_web/js/jquery" %>
 <%= render "layouts/letter_opener_web/js/favcount" %>
 
-<script>
+<script nonce="<%= content_security_policy_nonce %>">
 function update_favicon(favicon) {
     favicon.set($('.letter-opener a').length);
 }

diff --git a/app/views/layouts/letter_opener_web/js/_favcount.html.erb b/app/views/layouts/letter_opener_web/js/_favcount.html.erb
@@ -1,4 +1,4 @@
-<script>
+<script nonce="<%= content_security_policy_nonce %>">
 /*
  * favcount.js v1.5.0
  * http://chrishunt.co/favcount

diff --git a/app/views/layouts/letter_opener_web/js/_jquery.html.erb b/app/views/layouts/letter_opener_web/js/_jquery.html.erb