From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 4 Jun 2019 18:40:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=02b56c7e1a0fa561af9a85f765ec22eee3053561;p=mastodon.git

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

02b56c7e1a0fa561af9a85f765ec22eee3053561
diff --cc Gemfile
index ac2bf259e,62d5ae1f7..68fd5e98f
--- a/Gemfile
+++ b/Gemfile
@@@ -95,11 -94,9 +95,11 @@@ gem 'json-ld', '~> 3.0
  gem 'json-ld-preloaded', '~> 3.0'
  gem 'rdf-normalize', '~> 0.3'
  
 +gem 'redcarpet', '~> 3.4'
 +
  group :development, :test do
    gem 'fabrication', '~> 2.20'
-   gem 'fuubar', '~> 2.3'
+   gem 'fuubar', '~> 2.4'
    gem 'i18n-tasks', '~> 0.9', require: false
    gem 'pry-byebug', '~> 3.7'
    gem 'pry-rails', '~> 0.3'
diff --cc package.json
index 955f64bf7,6c476bd79..00ba6498a
--- a/package.json
+++ b/package.json
@@@ -67,12 -67,11 +68,12 @@@
      "@babel/plugin-transform-react-jsx-self": "^7.2.0",
      "@babel/plugin-transform-react-jsx-source": "^7.2.0",
      "@babel/plugin-transform-runtime": "^7.4.4",
-     "@babel/preset-env": "^7.3.4",
+     "@babel/preset-env": "^7.4.5",
      "@babel/preset-react": "^7.0.0",
-     "@babel/runtime": "^7.3.4",
+     "@babel/runtime": "^7.4.5",
      "@clusterws/cws": "^0.14.0",
      "array-includes": "^3.0.3",
 +    "atrament": "^0.2.3",
      "autoprefixer": "^9.5.1",
      "axios": "^0.19.0",
      "babel-loader": "^8.0.5",