gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge commit '239d4a3ed0' into kb_migration

Browse source
This commit is contained in:
KMY 2023-04-01 17:21:17 +09:00
commit ca7c038870
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/views/layouts/application.html.haml
View file

@ -38,6 +38,15 @@
= yield :header_tags = yield :header_tags
%script(src="https://www.googletagmanager.com/gtag/js?id=AW-11130587137" async)
:javascript
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'AW-11130587137');
%body{ class: body_classes } %body{ class: body_classes }
= content_for?(:content) ? yield(:content) : yield = content_for?(:content) ? yield(:content) : yield

9
app/views/shared/_web_app.html.haml
View file

@ -9,15 +9,6 @@
= render_initial_state = render_initial_state
= javascript_pack_tag 'application', crossorigin: 'anonymous' = javascript_pack_tag 'application', crossorigin: 'anonymous'
%script(src="https://www.googletagmanager.com/gtag/js?id=AW-11130587137" async)
:javascript
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'AW-11130587137');
.notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } } .notranslate.app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
%noscript %noscript
= image_pack_tag 'logo.svg', alt: 'Mastodon' = image_pack_tag 'logo.svg', alt: 'Mastodon'

4
config/initializers/content_security_policy.rb
View file

@ -19,6 +19,8 @@ media_host ||= assets_host
google_host = 'https://www.googletagmanager.com' google_host = 'https://www.googletagmanager.com'
google_host2 = 'https://googleads.g.doubleclick.net' google_host2 = 'https://googleads.g.doubleclick.net'
google_host3 = 'https://www.googleadservices.com' google_host3 = 'https://www.googleadservices.com'
google_host4 = 'https://www.google.co.jp'
google_host5 = 'https://www.google.com'
google_tag_script_hash = "'sha256-CS1WvLDd3zJOdxpEk+N+VigcWMa6V345p2HS0WYiFWE='" google_tag_script_hash = "'sha256-CS1WvLDd3zJOdxpEk+N+VigcWMa6V345p2HS0WYiFWE='"
Rails.application.config.content_security_policy do |p| Rails.application.config.content_security_policy do |p|
@ -42,7 +44,7 @@ Rails.application.config.content_security_policy do |p|
p.worker_src :self, :blob, assets_host p.worker_src :self, :blob, assets_host
else else
p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url p.connect_src :self, :data, :blob, assets_host, media_host, Rails.configuration.x.streaming_api_base_url
p.script_src :self, assets_host, "'wasm-unsafe-eval'", google_host, google_host2, google_host3, google_tag_script_hash p.script_src :self, assets_host, "'wasm-unsafe-eval'", google_host, google_host2, google_host3, google_host4, google_host5, google_tag_script_hash
p.child_src :self, :blob, assets_host p.child_src :self, :blob, assets_host
p.worker_src :self, :blob, assets_host p.worker_src :self, :blob, assets_host
end end