From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 20 Jan 2020 14:00:22 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=45709d6987db87b38e5a16c18ea3b2d9e55fba98;p=mastodon.git

Merge branch 'master' into glitch-soc/master

Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change.
---

45709d6987db87b38e5a16c18ea3b2d9e55fba98
diff --cc Gemfile.lock
index 44b858947,855c3cdf2..6527c468c
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -292,12 -267,9 +267,11 @@@ GE
        concurrent-ruby (~> 1.0)
      hashdiff (1.0.0)
      hashie (3.6.0)
-     heapy (0.1.4)
-     highline (2.0.1)
+     highline (2.0.3)
      hiredis (0.6.3)
      hkdf (0.3.0)
 +    html2text (0.2.1)
 +      nokogiri (~> 1.6)
      htmlentities (4.3.4)
      http (4.3.0)
        addressable (~> 2.3)
diff --cc app/views/layouts/admin.html.haml
index 10fa42e8b,b1a2d0617..ec3629dd8
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@@ -1,3 -1,7 +1,6 @@@
+ - content_for :header_tags do
+   = render_initial_state
 -  = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
+ 
  - content_for :content do
    .admin-wrapper
      .sidebar-wrapper
diff --cc app/views/layouts/embedded.html.haml
index 33e3714f8,d7e74ade5..6695b12dd
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@@ -10,14 -10,14 +10,18 @@@
      - if storage_host?
        %link{ rel: 'dns-prefetch', href: storage_host }/
  
 -    = stylesheet_pack_tag 'common', media: 'all'
 -    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
 -    = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
 -    = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
+     = render_initial_state
 -    = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
 +    = javascript_pack_tag "locales", integrity: true, 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'
 +      - elsif @theme[:supported_locales].include? 'en'
 +        = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous'
 +    = render partial: 'layouts/theme', object: @core
 +    = render partial: 'layouts/theme', object: @theme
 +
    %body.embed
      = yield
+ 
+     %div{ style: 'display: none'}
+       = render file: Rails.root.join('app', 'javascript', 'images', 'logo_transparent.svg')
diff --cc package.json
index 649ecbbcb,a401c7e51..1f9bb2695
--- a/package.json
+++ b/package.json
@@@ -71,10 -70,9 +71,10 @@@
      "@gamestdio/websocket": "^0.3.2",
      "@clusterws/cws": "^0.17.3",
      "array-includes": "^3.1.1",
 +    "atrament": "^0.2.3",
      "arrow-key-navigation": "^1.1.0",
-     "autoprefixer": "^9.7.3",
-     "axios": "^0.19.0",
+     "autoprefixer": "^9.7.4",
+     "axios": "^0.19.1",
      "babel-loader": "^8.0.6",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^4.0.0",
diff --cc yarn.lock
index 16f412128,67c2b87b5..839c60207
--- a/yarn.lock
+++ b/yarn.lock
@@@ -1732,17 -1863,13 +1863,17 @@@ atob@^2.1.1
    resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
    integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
  
 +atrament@^0.2.3:
 +  version "0.2.3"
 +  resolved "https://registry.yarnpkg.com/atrament/-/atrament-0.2.3.tgz#6ccbc0daa6d3f25e5aeaeb31befeb78e86980348"
 +
- autoprefixer@^9.7.3:
-   version "9.7.3"
-   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.3.tgz#fd42ed03f53de9beb4ca0d61fb4f7268a9bb50b4"
-   integrity sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q==
+ autoprefixer@^9.7.4:
+   version "9.7.4"
+   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz#f8bf3e06707d047f0641d87aee8cfb174b2a5378"
+   integrity sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==
    dependencies:
-     browserslist "^4.8.0"
-     caniuse-lite "^1.0.30001012"
+     browserslist "^4.8.3"
+     caniuse-lite "^1.0.30001020"
      chalk "^2.4.2"
      normalize-range "^0.1.2"
      num2fraction "^1.2.2"