From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 7 Nov 2020 17:19:34 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=412218af2ecd4cd004708d781e574208742dea4c;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream
---

412218af2ecd4cd004708d781e574208742dea4c
diff --cc app/views/layouts/_theme.html.haml
index 066d9de42,000000000..92de64b0d
mode 100644,000000..100644
--- a/app/views/layouts/_theme.html.haml
+++ b/app/views/layouts/_theme.html.haml
@@@ -1,13 -1,0 +1,13 @@@
 +- if theme
 +  - if theme[:pack] != 'common' && theme[:common]
 +    = render partial: 'layouts/theme', object: theme[:common]
 +  - if theme[:pack]
-     = javascript_pack_tag theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}", integrity: true, crossorigin: 'anonymous'
++    = javascript_pack_tag theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}", crossorigin: 'anonymous'
 +    - if theme[:skin]
 +      - if !theme[:flavour] || theme[:skin] == 'default'
-         = stylesheet_pack_tag theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}", integrity: true, media: 'all'
++        = stylesheet_pack_tag theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}", media: 'all', crossorigin: 'anonymous'
 +      - else
-         = stylesheet_pack_tag "skins/#{theme[:flavour]}/#{theme[:skin]}/#{theme[:pack]}"
++        = stylesheet_pack_tag "skins/#{theme[:flavour]}/#{theme[:skin]}/#{theme[:pack]}", crossorigin: 'anonymous'
 +    - if theme[:preload]
 +      - theme[:preload].each do |link|
 +        %link{ href: asset_pack_path("#{link}.js"), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
diff --cc app/views/layouts/application.html.haml
index 1481f6973,9501207e0..32681773f
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@@ -21,12 -21,10 +21,12 @@@
  
      %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
  
-     = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
 -    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
 -    = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
 -    = javascript_pack_tag 'common', crossorigin: 'anonymous'
 -    = javascript_pack_tag "locale_#{I18n.locale}", crossorigin: 'anonymous'
++    = javascript_pack_tag "locales", crossorigin: 'anonymous'
 +    - if @theme
 +      - if @theme[:supported_locales].include? I18n.locale.to_s
-         = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
++        = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'
 +      - elsif @theme[:supported_locales].include? 'en'
-         = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous'
++        = javascript_pack_tag "locales/#{@theme[:flavour]}/en", crossorigin: 'anonymous'
      = csrf_meta_tags
      %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
  
diff --cc app/views/layouts/embedded.html.haml
index 69b206f69,e4311d342..431bd260c
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@@ -11,16 -11,12 +11,16 @@@
      - if storage_host?
        %link{ rel: 'dns-prefetch', href: storage_host }/
  
 -    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
 -    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous'
 -    = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
 -    = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
      = render_initial_state
-     = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
 -    = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
++    = javascript_pack_tag "locales", crossorigin: 'anonymous'
 +    - if @theme
 +      - if @theme[:supported_locales].include? I18n.locale.to_s
-         = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
++        = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'
 +      - elsif @theme[:supported_locales].include? 'en'
-         = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous'
++        = javascript_pack_tag "locales/#{@theme[:flavour]}/en", crossorigin: 'anonymous'
 +    = render partial: 'layouts/theme', object: @core
 +    = render partial: 'layouts/theme', object: @theme
 +
    %body.embed
      = yield
  
diff --cc app/views/layouts/error.html.haml
index f8315afb5,852a0c69b..55da5de3f
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@@ -5,9 -5,10 +5,9 @@@
      %meta{ charset: 'utf-8' }/
      %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
      %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
-     = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
 -    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
 -    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous'
 -    = javascript_pack_tag 'common', crossorigin: 'anonymous'
 -    = javascript_pack_tag 'error', crossorigin: 'anonymous'
++    = javascript_pack_tag "locales", crossorigin: 'anonymous'
 +    = render partial: 'layouts/theme', object: (@core || { pack: 'common' })
 +    = render partial: 'layouts/theme', object: (@theme || { pack: 'error', flavour: 'glitch', common: { pack: 'common', flavour: 'glitch', skin: 'default' } })
    %body.error
      .dialog
        .dialog__illustration
diff --cc app/views/media/player.html.haml
index bd5610a0b,92428ca94..7369628a4
--- a/app/views/media/player.html.haml
+++ b/app/views/media/player.html.haml
@@@ -1,13 -1,6 +1,13 @@@
  - content_for :header_tags do
    = render_initial_state
-   = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
 -  = javascript_pack_tag 'public', crossorigin: 'anonymous'
++  = javascript_pack_tag "locales", crossorigin: 'anonymous'
 +  - if @theme
 +    - if @theme[:supported_locales].include? I18n.locale.to_s
-       = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
++      = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'
 +    - elsif @theme[:supported_locales].include? 'en'
-       = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous'
++      = javascript_pack_tag "locales/#{@theme[:flavour]}/en", crossorigin: 'anonymous'
 +  = render partial: 'layouts/theme', object: @core
 +  = render partial: 'layouts/theme', object: @theme
  
  - if @media_attachment.video?
    = react_component :video, src: @media_attachment.file.url(:original), preview: @media_attachment.thumbnail.present? ? @media_attachment.thumbnail.url : @media_attachment.file.url(:small), blurhash: @media_attachment.blurhash, width: 670, height: 380, editable: true, detailed: true, inline: true, alt: @media_attachment.description do
diff --cc package.json
index 15f6b39f9,b51863c71..b125f8cb6
--- a/package.json
+++ b/package.json
@@@ -96,8 -94,7 +96,8 @@@
      "escape-html": "^1.0.3",
      "exif-js": "^2.3.0",
      "express": "^4.17.1",
 +    "favico.js": "^0.3.10",
-     "file-loader": "^6.1.1",
+     "file-loader": "^6.2.0",
      "font-awesome": "^4.7.0",
      "glob": "^7.1.6",
      "history": "^4.10.1",