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

Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc config/locales/ja.yml
Simple merge

diff --cc package.json
index 078ad82f75889f30a99f0d131f2576d470935936,c691d8e4345c5c1220a307461f933fb674a0a83d..87b4ead51141008a74f99ed8be165e8a5d1678b0
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -74,8 -73,7 +74,8 @@@
      "@babel/runtime": "^7.4.5",
      "@clusterws/cws": "^0.14.0",
      "array-includes": "^3.0.3",
-     "autoprefixer": "^9.5.1",
 +    "atrament": "^0.2.3",
+     "autoprefixer": "^9.6.0",
      "axios": "^0.19.0",
      "babel-loader": "^8.0.5",
      "babel-plugin-lodash": "^3.3.4",
@@@ -96,8 -94,7 +96,8 @@@
      "escape-html": "^1.0.3",
      "exif-js": "^2.3.0",
      "express": "^4.17.1",
-     "file-loader": "^3.0.1",
 +    "favico.js": "^0.3.10",
+     "file-loader": "^4.0.0",
      "font-awesome": "^4.7.0",
      "glob": "^7.1.1",
      "http-link-header": "^1.0.2",

diff --cc spec/lib/sanitize_config_spec.rb
index 0000000000000000000000000000000000000000,bb3cf6f0b238a2c324110a8ae3953a2309d88139..c5143bcefa73d875e102bf9928ed8bdf4aaba27a
mode 000000,100644..100644
--- /dev/null
--- 2/spec/lib/sanitize_config_spec.rb
+++ b/spec/lib/sanitize_config_spec.rb
@@@ -1,0 -1,26 +1,18 @@@
 -    it 'converts h1 to p' do
 -      expect(Sanitize.fragment('<h1>Foo</h1>', subject)).to eq '<p>Foo</p>'
+ # frozen_string_literal: true
+ 
+ require 'rails_helper'
+ require Rails.root.join('app', 'lib', 'sanitize_config.rb')
+ 
+ describe Sanitize::Config do
+   describe '::MASTODON_STRICT' do
+     subject { Sanitize::Config::MASTODON_STRICT }
+ 
 -    it 'converts ul to p' do
 -      expect(Sanitize.fragment('<p>Check out:</p><ul><li>Foo</li><li>Bar</li></ul>', subject)).to eq '<p>Check out:</p><p>Foo<br>Bar</p>'
 -    end
 -
 -    it 'converts p inside ul' do
 -      expect(Sanitize.fragment('<ul><li><p>Foo</p><p>Bar</p></li><li>Baz</li></ul>', subject)).to eq '<p>Foo<br>Bar<br>Baz</p>'
 -    end
 -
 -    it 'converts ul inside ul' do
 -      expect(Sanitize.fragment('<ul><li>Foo</li><li><ul><li>Bar</li><li>Baz</li></ul></li></ul>', subject)).to eq '<p>Foo<br>Bar<br>Baz</p>'
++    it 'keeps h1' do
++      expect(Sanitize.fragment('<h1>Foo</h1>', subject)).to eq '<h1>Foo</h1>'
+     end
+ 
++    it 'keeps ul' do
++      expect(Sanitize.fragment('<p>Check out:</p><ul><li>Foo</li><li>Bar</li></ul>', subject)).to eq '<p>Check out:</p><ul><li>Foo</li><li>Bar</li></ul>'
+     end
+   end
+ end

diff --cc yarn.lock
index fda6e8aad1617fa1be139116b3fedc7033a942ce,b9b47c18552dd931b8e0328ade104b3a9c157853..fb78886e1eb80d39623876e9b8e0a5e07c5977a1
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -1664,20 -1688,17 +1688,21 @@@ atob@^2.1.1
    resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
    integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
  
- autoprefixer@^9.5.1:
-   version "9.5.1"
-   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
-   integrity sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==
 +atrament@^0.2.3:
 +  version "0.2.3"
 +  resolved "https://registry.yarnpkg.com/atrament/-/atrament-0.2.3.tgz#6ccbc0daa6d3f25e5aeaeb31befeb78e86980348"
 +
+ autoprefixer@^9.6.0:
+   version "9.6.0"
+   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.0.tgz#0111c6bde2ad20c6f17995a33fad7cf6854b4c87"
+   integrity sha512-kuip9YilBqhirhHEGHaBTZKXL//xxGnzvsD0FtBQa6z+A69qZD6s/BAX9VzDF1i9VKDquTJDQaPLSEhOnL6FvQ==
    dependencies:
-     browserslist "^4.5.4"
-     caniuse-lite "^1.0.30000957"
+     browserslist "^4.6.1"
+     caniuse-lite "^1.0.30000971"
+     chalk "^2.4.2"
      normalize-range "^0.1.2"
      num2fraction "^1.2.2"
-     postcss "^7.0.14"
+     postcss "^7.0.16"
      postcss-value-parser "^3.3.1"
  
  aws-sign2@~0.7.0: