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

Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code

package.json

@@ -60,9 +60,9 @@
   },
   "private": true,
   "dependencies": {
-    "@babel/core": "^7.4.5",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-decorators": "^7.6.0",
+    "@babel/core": "^7.7.2",
+    "@babel/plugin-proposal-class-properties": "^7.7.0",
+    "@babel/plugin-proposal-decorators": "^7.7.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-transform-react-inline-elements": "^7.2.0",
@@ -70,9 +70,9 @@
     "@babel/plugin-transform-react-jsx-source": "^7.5.0",
     "@babel/plugin-transform-runtime": "^7.5.5",
     "@babel/preset-env": "^7.7.1",
-    "@babel/preset-react": "^7.6.3",
-    "@babel/runtime": "^7.7.1",
-    "@clusterws/cws": "^0.15.2",
+    "@babel/preset-react": "^7.7.0",
+    "@babel/runtime": "^7.7.2",
+    "@clusterws/cws": "^0.16.0",
     "array-includes": "^3.0.3",
     "atrament": "^0.2.3",
     "arrow-key-navigation": "^1.0.2",
@@ -80,14 +80,14 @@
     "axios": "^0.19.0",
     "babel-loader": "^8.0.6",
     "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-preval": "^3.0.1",
-    "babel-plugin-react-intl": "^3.1.3",
+    "babel-plugin-preval": "^4.0.0",
+    "babel-plugin-react-intl": "^3.4.1",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "babel-runtime": "^6.26.0",
     "blurhash": "^1.0.0",
     "classnames": "^2.2.5",
     "compression-webpack-plugin": "^3.0.0",
-    "copy-webpack-plugin": "^5.0.4",
+    "copy-webpack-plugin": "^5.0.5",
     "cross-env": "^6.0.3",
     "css-loader": "^3.2.0",
     "cssnano": "^4.1.10",
@@ -101,7 +101,7 @@
     "file-loader": "^4.2.0",
     "favico.js": "^0.3.10",
     "font-awesome": "^4.7.0",
-    "glob": "^7.1.5",
+    "glob": "^7.1.6",
     "history": "^4.10.1",
     "http-link-header": "^1.0.2",
     "immutable": "^3.8.2",
@@ -130,23 +130,23 @@
     "punycode": "^2.1.0",
     "rails-ujs": "^5.2.3",
     "react": "^16.10.2",
-    "react-dom": "^16.11.0",
+    "react-dom": "^16.12.0",
     "react-hotkeys": "^1.1.4",
     "react-immutable-proptypes": "^2.1.0",
     "react-immutable-pure-component": "^1.1.1",
     "react-intl": "^2.9.0",
     "react-masonry-infinite": "^1.2.2",
     "react-motion": "^0.5.2",
-    "react-notification": "^6.8.4",
+    "react-notification": "^6.8.5",
     "react-overlays": "^0.9.1",
     "react-redux": "^7.1.1",
     "react-redux-loading-bar": "^4.0.8",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
-    "react-select": "^3.0.5",
+    "react-select": "^3.0.8",
     "react-sparklines": "^1.7.0",
     "react-swipeable-views": "^0.13.3",
-    "react-textarea-autosize": "^7.1.0",
+    "react-textarea-autosize": "^7.1.2",
     "react-toggle": "^4.1.1",
     "redis": "^2.7.1",
     "redux": "^4.0.4",
@@ -164,7 +164,7 @@
     "tesseract.js": "^2.0.0-beta.2",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
-    "uuid": "^3.1.0",
+    "uuid": "^3.3.3",
     "wavesurfer.js": "^3.2.0",
     "webpack": "^4.41.2",
     "webpack-assets-manifest": "^3.1.1",
@@ -178,7 +178,7 @@
     "babel-eslint": "^10.0.3",
     "babel-jest": "^24.9.0",
     "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.14.0",
+    "enzyme-adapter-react-16": "^1.15.1",
     "eslint": "^6.5.1",
     "eslint-plugin-import": "~2.18.2",
     "eslint-plugin-jsx-a11y": "~6.2.3",