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

fgrehm · fgrehm · commit 1a4a504c6730 · 2021-10-19T22:09:28.000-03:00
Conflicts:
	app/views/layouts/letter_opener_web/_javascripts.html.erb
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

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<%= render "layouts/letter_opener_web/js/jquery" %>`
`2`	`2`	`<%= render "layouts/letter_opener_web/js/favcount" %>`
`3`	`3`
`4`		`-<script>`
	`4`	`+<script nonce="<%= content_security_policy_nonce %>">`
`5`	`5`	`function update_favicon(favicon) {`
`6`	`6`	`favicon.set($('.letter-opener a').length);`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<script>`
	`1`	`+<script nonce="<%= content_security_policy_nonce %>">`
`2`	`2`	`/*`
`3`	`3`	`* favcount.js v1.5.0`
`4`	`4`	`* http://chrishunt.co/favcount`