Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream

2023-05-25 23:47:28 +02:00
parent 3b375ee395 e387175fc9
commit e2ab9d4dad
46 changed files with 570 additions and 303 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -299,11 +299,11 @@ class Account < ApplicationRecord
  end

  def fields
-    (self[:fields] || []).map do |f|
+    (self[:fields] || []).filter_map do |f|
      Account::Field.new(self, f)
    rescue
      nil
-    end.compact
+    end
  end

  def fields_attributes=(attributes)