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

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

app/models/account.rb

@@ -102,6 +102,7 @@ class Account < ApplicationRecord
   scope :tagged_with, ->(tag) { joins(:accounts_tags).where(accounts_tags: { tag_id: tag }) }
   scope :by_recent_status, -> { order(Arel.sql('(case when account_stats.last_status_at is null then 1 else 0 end) asc, account_stats.last_status_at desc')) }
   scope :popular, -> { order('account_stats.followers_count desc') }
+  scope :without_blocking, ->(account) { account.nil? ? all : where.not(id: Block.where(target_account_id: account.id).pluck(:account_id)) }
 
   delegate :email,
            :unconfirmed_email,

app/models/form/admin_settings.rb

@@ -28,6 +28,9 @@ class Form::AdminSettings
     profile_directory
     hide_followers_count
     flavour_and_skin
+    thumbnail
+    hero
+    mascot
   ).freeze
 
   BOOLEAN_KEYS = %i(
@@ -73,7 +76,7 @@ class Form::AdminSettings
       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

app/models/site_upload.rb

@@ -18,6 +18,7 @@ class SiteUpload < ApplicationRecord
   has_attached_file :file
 
   validates_attachment_content_type :file, content_type: /\Aimage\/.*\z/
+  validates :file, presence: true
   validates :var, presence: true, uniqueness: true
 
   before_save :set_meta