Merge remote-tracking branch 'origin' into merge_glicth-soc_2022-01-31

diff --cc .env.production.sample
index e6d10578bc6088cb21ae95a007e4f33c3109afa9,7de5e00f40e006aaf392c954b8e4e777395bc907..7957bd13750690bc946ada4b164f70e0be471525
--- 1/.env.production.sample
--- 2/.env.production.sample
+++ b/.env.production.sample
@@@ -286,7 -286,6 +286,11 @@@ MAX_POLL_OPTION_CHARS=10
  MAX_EMOJI_SIZE=51200
  MAX_REMOTE_EMOJI_SIZE=204800
  
 +# Source code repository
 +GITHUB_REPOSITORY=kibicat/mastodon
 +# Or if it isn’t hosted on GitHub…
 +# SOURCE_BASE_URL=https://github.com/kibicat/mastodon
++
+ # Optional hCaptcha support
+ # HCAPTCHA_SECRET_KEY=
+ # HCAPTCHA_SITE_KEY=

diff --cc app/models/user.rb
Simple merge

diff --cc spec/models/user_spec.rb
Simple merge

diff --cc yarn.lock
index f682076f917ef29f7e69ab1ef55f1ef23c454b7f,313a3567afa2c4e96ebd1eb103db11b7684318b1..4524f5cb61992a7a399f4bdb4edcabbf2f257009
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -10681,12 -10632,13 +10634,12 @@@ ts-essentials@^2.0.3
    resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745"
    integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w==
  
- tsconfig-paths@^3.11.0:
-   version "3.11.0"
-   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36"
-   integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==
+ tsconfig-paths@^3.12.0:
+   version "3.12.0"
+   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
+   integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==
    dependencies:
 -    "@types/json5" "^0.0.29"
 -    json5 "^1.0.1"
 +    json5 "^2.2.0"
      minimist "^1.2.0"
      strip-bom "^3.0.0"