Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-09-21 15:06:06 +02:00
parent b0f6d3e112 7ed9c590b9
commit 221bba1897
310 changed files with 2257 additions and 2167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/account.rb
View File

@@ -44,7 +44,6 @@
# hide_collections :boolean
# avatar_storage_schema_version :integer
# header_storage_schema_version :integer
# devices_url :string
# suspension_origin :integer
# sensitized_at :datetime
# trendable :boolean
@@ -56,11 +55,12 @@
class Account < ApplicationRecord
self.ignored_columns += %w(
subscription_expires_at
secret
devices_url
hub_url
remote_url
salmon_url
hub_url
secret
subscription_expires_at
trust_level
)