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

Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index fe7586140dcad722e32241fa136c0d35da5f5555,a5c48dfd0a10a46242a8a2aceb850ca7f087d6d5..e45bcb5ffb64e51bb77e57dd98363a575cc45b87
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -480,8 -478,7 +480,8 @@@ GE
        link_header (~> 0.0, >= 0.0.8)
      rdf-normalize (0.3.3)
        rdf (>= 2.2, < 4.0)
-     redis (4.1.1)
 +    redcarpet (3.4.0)
+     redis (4.1.2)
      redis-actionpack (5.0.2)
        actionpack (>= 4.0, < 6)
        redis-rack (>= 1, < 3)

diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc config/settings.yml
index bde43cb3c054cc900b157100f34049bc926033cb,805624d3e1e165593ca7952d038f7e8119c8aa97..97da9883ee41590b399e9f105d84b1077dbd78f0
--- 1/config/settings.yml
--- 2/config/settings.yml
+++ b/config/settings.yml
@@@ -27,15 -26,12 +27,15 @@@ defaults: &default
    expand_spoilers: false
    preview_sensitive_media: false
    reduce_motion: false
 -  show_application: true
 +  show_application: false
    system_font_ui: false
    noindex: false
 -  theme: 'default'
 +  hide_followers_count: false
 +  enable_keybase: true
 +  flavour: 'glitch'
 +  skin: 'default'
    aggregate_reblogs: true
-   advanced_layout: true
+   advanced_layout: false
    notification_emails:
      follow: false
      reblog: false

diff --cc config/webpack/rules/css.js
index 9553cb55b6c8b2d0ed0ce09cd52994f381731359,3b5b51232029fdfbda34b49a4408c11e073e4d70..f9b87de9b5bd54b219cb066cfb15a1f0eb2222e5
--- 1/config/webpack/rules/css.js
--- 2/config/webpack/rules/css.js
+++ b/config/webpack/rules/css.js
@@@ -21,8 -21,6 +21,7 @@@ module.exports = 
      {
        loader: 'sass-loader',
        options: {
-         fiber: require('fibers'),
 +        includePaths: ['app/javascript'],
          implementation: require('sass'),
          sourceMap: true,
        },

diff --cc db/schema.rb
Simple merge

diff --cc package.json
index 53fe77899f6aceb3133b021db70973118b9e6fee,8a63ec2113fd2199c49a2a0057312ff5ae25670b..955f64bf7bb51abeefc9c668ab3d7b1cab377cea
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -72,9 -71,8 +72,9 @@@
      "@babel/runtime": "^7.3.4",
      "@clusterws/cws": "^0.14.0",
      "array-includes": "^3.0.3",
-     "autoprefixer": "^9.4.10",
-     "axios": "^0.18.0",
 +    "atrament": "^0.2.3",
+     "autoprefixer": "^9.5.1",
+     "axios": "^0.19.0",
      "babel-loader": "^8.0.5",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^3.0.1",
@@@ -94,8 -92,6 +94,7 @@@
      "escape-html": "^1.0.3",
      "exif-js": "^2.3.0",
      "express": "^4.17.1",
-     "fibers": "^3.1.1",
 +    "favico.js": "^0.3.10",
      "file-loader": "^3.0.1",
      "font-awesome": "^4.7.0",
      "glob": "^7.1.1",

diff --cc spec/services/notify_service_spec.rb
Simple merge

diff --cc yarn.lock
index d2a5f48252d1c3fe302a6820555dbe4955a74377,bf7da496fe1b6bc8aa5af30d5f5447ec701d09dd..7f16f103db5762a3fdfb2229815cc30f426bc1fb
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -1531,17 -1551,13 +1551,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==
  
- autoprefixer@^9.4.10:
-   version "9.4.10"
-   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.10.tgz#e1be61fc728bacac8f4252ed242711ec0dcc6a7b"
-   integrity sha512-XR8XZ09tUrrSzgSlys4+hy5r2/z4Jp7Ag3pHm31U4g/CTccYPOVe19AkaJ4ey/vRd1sfj+5TtuD6I0PXtutjvQ==
 +atrament@^0.2.3:
 +  version "0.2.3"
 +  resolved "https://registry.yarnpkg.com/atrament/-/atrament-0.2.3.tgz#6ccbc0daa6d3f25e5aeaeb31befeb78e86980348"
 +
+ 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==
    dependencies:
-     browserslist "^4.4.2"
-     caniuse-lite "^1.0.30000940"
+     browserslist "^4.5.4"
+     caniuse-lite "^1.0.30000957"
      normalize-range "^0.1.2"
      num2fraction "^1.2.2"
      postcss "^7.0.14"