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

diff --cc Gemfile
index ac2bf259e466796c03905c1a268ee2c25b3360ca,62d5ae1f74210017d4592e1aa1730c44b5176de3..68fd5e98fef5b9e4bf4b622da4cd0a22c444c335
--- 1/Gemfile
--- 2/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 Gemfile.lock
Simple merge

diff --cc package.json
index 955f64bf7bb51abeefc9c668ab3d7b1cab377cea,6c476bd797a1c5382f336e13ecfd9d7f4bf38460..00ba6498a6a59ac336bd3cb1b5352231c8f58324
--- 1/package.json
--- 2/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",

diff --cc yarn.lock
Simple merge