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

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml

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/models/account.rb
Simple merge

diff --cc app/models/form/admin_settings.rb
index 0fcbd06054667c38076ff195bd7c07c936b7dd5f,d3af8c30f5283d224f46399ccc04bf0889bedf2c..5b71dfad5c8476e604adbf1e75ec27d140ce2322
--- 1/app/models/form/admin_settings.rb
--- 2/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@@ -26,8 -25,9 +26,11 @@@ class Form::AdminSetting
      preview_sensitive_media
      custom_css
      profile_directory
 +    hide_followers_count
 +    flavour_and_skin
+     thumbnail
+     hero
+     mascot
    ).freeze
  
    BOOLEAN_KEYS = %i(
@@@ -70,10 -65,9 +73,10 @@@
      return false unless valid?
  
      KEYS.each do |key|
 +      next if PSEUDO_KEYS.include?(key)
        value = instance_variable_get("@#{key}")
  
-       if UPLOAD_KEYS.include?(key)
+       if UPLOAD_KEYS.include?(key) && !value.nil?
          upload = SiteUpload.where(var: key).first_or_initialize(var: key)
          upload.update(file: value)
        else

diff --cc config/locales/en.yml
index 682f8540635fa2660c3ffd516f82c20104ce32b7,705024ff5bd84f38c8b794713355b0bad99b0d0d..a8a19f85ddfd8528c738ba8f334c98d7d4f74cb3
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -636,8 -633,8 +636,9 @@@ en
      all: All
      changes_saved_msg: Changes successfully saved!
      copy: Copy
+     order_by: Order by
      save_changes: Save changes
 +    use_this: Use this
      validation_errors:
        one: Something isn't quite right yet! Please review the error below
        other: Something isn't quite right yet! Please review %{count} errors below

diff --cc config/locales/ja.yml
index 054d9083353625590ba6032d71a7966d3e0b3262,09214a937c50cca8db57e63449b03c55cd63a026..85a31095312fe4f1f7e9ed54ee296cb8af887313
--- 1/config/locales/ja.yml
--- 2/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@@ -629,8 -633,8 +633,9 @@@ ja
      all: すべて
      changes_saved_msg: 正常に変更されました！
      copy: コピー
+     order_by: 並び順
      save_changes: 変更を保存
 +    use_this: これを使う
      validation_errors:
        one: エラーが発生しました！ 以下のエラーを確認してください
        other: エラーが発生しました！ 以下の%{count}個のエラーを確認してください
@@@ -823,7 -861,7 +862,8 @@@
      edit_profile: プロフィールを編集
      export: データのエクスポート
      featured_tags: 注目のハッシュタグ
 +    flavours: フレーバー
+     identity_proofs: Identity proofs
      import: データのインポート
      migrate: アカウントの引っ越し
      notifications: 通知