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

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.

diff --cc .env.production.sample
index 65f3f9d1f38a4e9f0895e83aad8fe9733b1cd262,c24c31c9b607008f97ebbbb1df854151ff7a7d81..86f770e7860e271dcbaf4bcc1581a7cfd2b85cc7
--- 1/.env.production.sample
--- 2/.env.production.sample
+++ b/.env.production.sample
@@@ -49,13 -29,14 +55,15 @@@ DB_NAME=mastodon_productio
  DB_PASS=
  DB_PORT=5432
  
 +
  # ElasticSearch (optional)
  # ------------------------
 -ES_ENABLED=true
 -ES_HOST=localhost
 -ES_PORT=9200
 +#ES_ENABLED=true
 +#ES_HOST=localhost
 +#ES_PORT=9200
- 
+ # Authentication for ES (optional)
 -ES_USER=elastic
 -ES_PASS=password
++#ES_USER=elastic
++#ES_PASS=password
  
  # Secrets
  # -------

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index 48287af96e973f8a5357d8649dbaf655650ec5b1,fb004280dc2a1632de7c8bfe20c1d4816cc737ad..2850aa829abce4c2740998fc1e436aa9f94584b3
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -481,8 -479,7 +479,8 @@@ GE
        link_header (~> 0.0, >= 0.0.8)
      rdf-normalize (0.4.0)
        rdf (~> 3.1)
-     redis (4.4.0)
 +    redcarpet (3.5.1)
+     redis (4.5.1)
      redis-namespace (1.8.1)
        redis (>= 3.0.4)
      regexp_parser (2.1.1)
@@@ -758,8 -753,7 +754,8 @@@ DEPENDENCIE
    rails-i18n (~> 6.0)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.4)
-   redis (~> 4.4)
 +  redcarpet (~> 3.5)
+   redis (~> 4.5)
    redis-namespace (~> 1.8)
    rqrcode (~> 2.1)
    rspec-rails (~> 5.0)

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

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

diff --cc config/routes.rb
Simple merge

diff --cc package.json
index 5193237c428cf7c85322357db779229d9c70195d,4caf359b40cd4b0fa04b408f070de5d34829095d..b6e11bc9a44af2455959d781f12e2b94798df95f
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -72,10 -71,9 +72,10 @@@
      "@github/webauthn-json": "^0.5.7",
      "@rails/ujs": "^6.1.4",
      "array-includes": "^3.1.4",
 +    "atrament": "0.2.4",
      "arrow-key-navigation": "^1.2.0",
      "autoprefixer": "^9.8.8",
-     "axios": "^0.22.0",
+     "axios": "^0.23.0",
      "babel-loader": "^8.2.2",
      "babel-plugin-lodash": "^3.3.4",
      "babel-plugin-preval": "^5.0.0",

diff --cc spec/models/concerns/account_interactions_spec.rb
Simple merge

diff --cc yarn.lock
Simple merge