tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/models
History
Claire d099de23c5 Merge commit 'bf32befcc21831b31f684795bb211b2f1f4cfb6d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream reordered model annotations, while glitch-soc has extra columns.
  Reordered as upstream did.
- `app/models/status_edit.rb`:
  Upstream reordered model annotations, while glitch-soc has extra columns.
  Reordered as upstream did.
2026-03-12 19:01:28 +01:00
..
account
…
account_suggestions
…
admin
Add moderation consequences for collections (#37974)
2026-02-25 14:32:07 +00:00
annual_report
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
concerns
Merge commit 'e235c446c96280c015fb27f7eefe4e95a5a39892' into glitch-soc/merge-upstream
2026-03-09 12:41:12 +01:00
fasp
Reject unconfirmed FASPs (#37926)
2026-02-20 14:40:31 +00:00
form
Merge commit '2f657019201d73c9d86d1ece339e66e72954f0eb' into glitch-soc/merge-upstream
2026-03-02 12:19:02 +01:00
terms_of_service
…
trends
Merge commit '811575a10903cada549580979cc809ca98ad570c' into glitch-soc/merge-upstream
2026-03-11 18:50:59 +01:00
user_settings
…
web
…
account_alias.rb
…
account_conversation.rb
…
account_deletion_request.rb
…
account_domain_block.rb
…
account_filter.rb
…
account_migration.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
account_moderation_note.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
account_note.rb
…
account_pin.rb
…
account_relationship_severance_event.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
account_stat.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
account_statuses_cleanup_policy.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
account_suggestions.rb
…
account_summary.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
account_warning_preset.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
account_warning.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
account.rb
Merge commit 'adede83c7c9a943cf9954fe865becf6a0c2d2280' into glitch-soc/merge-upstream
2026-03-12 18:48:32 +01:00
admin.rb
…
announcement_filter.rb
…
announcement_mute.rb
…
announcement_reaction.rb
…
announcement.rb
…
appeal.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
application_record.rb
…
async_refresh.rb
…
backup.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
block.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
bookmark.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
bulk_import_row.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
bulk_import.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
canonical_email_block.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
collection_item.rb
Ingestion of remote collection items (#38106)
2026-03-09 14:59:57 +00:00
collection_report.rb
Allow reporting (local) Collections (#37848)
2026-02-13 11:11:44 +00:00
collection.rb
Ingestion of remote collections (#38144)
2026-03-11 14:29:00 +00:00
content_retention_policy.rb
…
context.rb
…
conversation_mute.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
conversation.rb
Fix creation of duplicate conversations (#37108)
2025-12-03 14:33:27 +00:00
custom_emoji_category.rb
Emoji: Update emoji categories with featured emoji (#37084)
2025-12-02 10:30:08 +00:00
custom_emoji_filter.rb
…
custom_emoji.rb
Merge commit 'bf32befcc21831b31f684795bb211b2f1f4cfb6d' into glitch-soc/merge-upstream
2026-03-12 19:01:28 +01:00
custom_filter_keyword.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
custom_filter_status.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
custom_filter.rb
Merge commit from fork
2026-01-20 15:13:10 +01:00
direct_feed.rb
…
domain_allow.rb
Add coverage for "domain variants" consumers (#35995)
2025-12-16 10:24:27 +00:00
domain_block.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
email_domain_block.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
export.rb
…
extended_description.rb
…
fasp.rb
…
favourite.rb
…
featured_tag.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
feed.rb
…
follow_recommendation_filter.rb
…
follow_recommendation_mute.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
follow_recommendation_suppression.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
follow_recommendation.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
follow_request.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
follow.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
generated_annual_report.rb
Add account_id attribute to AnnualReport entity (#37182)
2025-12-09 15:59:40 +00:00
home_feed.rb
…
identity.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
instance_filter.rb
…
instance_moderation_note.rb
…
instance.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
invite_filter.rb
…
invite.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
ip_block.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
link_feed.rb
…
list_account.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
list_feed.rb
…
list.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
login_activity.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
marker.rb
…
media_attachment.rb
Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream
2026-02-18 18:40:03 +01:00
mention.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
mute.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
notification_group.rb
…
notification_permission.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
notification_policy.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
notification_request.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
notification.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
poll_vote.rb
…
poll.rb
…
preview_card_provider.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
preview_card_trend.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
preview_card.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
preview_cards_status.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
privacy_policy.rb
…
public_feed.rb
…
quote.rb
Fix quote cache invalidation (#37592)
2026-01-23 13:35:43 +00:00
relationship_filter.rb
…
relationship_severance_event.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
relay.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
remote_follow.rb
…
report_filter.rb
…
report_note.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
report.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
rule_translation.rb
…
rule.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
scheduled_status.rb
…
search.rb
…
session_activation.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
setting.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
severed_relationship.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
site_upload.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
software_update.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
status_edit.rb
Merge commit 'bf32befcc21831b31f684795bb211b2f1f4cfb6d' into glitch-soc/merge-upstream
2026-03-12 19:01:28 +01:00
status_pin.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
status_stat.rb
…
status_trend.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
status.rb
Merge commit 'bf32befcc21831b31f684795bb211b2f1f4cfb6d' into glitch-soc/merge-upstream
2026-03-12 19:01:28 +01:00
tag_feed.rb
…
tag_follow.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
tag_trend.rb
…
tag.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
terms_of_service.rb
Add TermsOfService#usable_effective_date to DRY up view logic (#38095)
2026-03-09 09:38:00 +00:00
tombstone.rb
…
translation.rb
…
trends.rb
…
unavailable_domain.rb
…
user_invite_request.rb
…
user_ip.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
user_role.rb
Add ability to require 2FA for specific roles (including Everybody) (#37701)
2026-02-11 14:34:09 +00:00
user_settings.rb
Merge commit 'a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2' into glitch-soc/merge-upstream
2026-01-03 15:26:58 +01:00
user.rb
Merge commit '64629eadb71afab79a741b016dc56a8bdf1d46f2' into glitch-soc/merge-upstream
2026-03-10 18:04:32 +01:00
username_block.rb
…
web.rb
…
webauthn_credential.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
webhook.rb
Run annotaterb models after bug fix to re-order model comments (#38172)
2026-03-12 14:00:41 +00:00
worker_batch.rb
…