tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d6fa72cfdf45967553772999ada400dd430d74cd
Mastodon/app/models
T
History
Claire 0e1ea3110e Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
  line adding a glitch API version.
2026-02-27 21:25:37 +01:00
..
account
…
account_suggestions
…
admin
Add moderation consequences for collections (#37974)
2026-02-25 14:32:07 +00:00
annual_report
…
concerns
Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream
2026-02-27 21:25:37 +01:00
fasp
Reject unconfirmed FASPs (#37926)
2026-02-20 14:40:31 +00:00
form
Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream
2025-12-17 18:27:14 +01:00
terms_of_service
…
trends
Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream
2026-02-18 18:40:03 +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
…
account_moderation_note.rb
…
account_note.rb
…
account_pin.rb
…
account_relationship_severance_event.rb
…
account_stat.rb
…
account_statuses_cleanup_policy.rb
…
account_suggestions.rb
…
account_summary.rb
…
account_warning_preset.rb
…
account_warning.rb
…
account.rb
Merge commit 'bca57020a04c552a3c91912a0e0b69ddafaad06a' into glitch-soc/merge-upstream
2026-02-26 18:27:02 +01:00
admin.rb
…
announcement_filter.rb
…
announcement_mute.rb
…
announcement_reaction.rb
…
announcement.rb
…
appeal.rb
…
application_record.rb
…
async_refresh.rb
…
backup.rb
…
block.rb
…
bookmark.rb
…
bulk_import_row.rb
…
bulk_import.rb
Fix misc comment typos (#37183)
2025-12-09 16:09:01 +00:00
canonical_email_block.rb
…
collection_item.rb
Issue FeatureAuthorizations (#38004)
2026-02-27 11:00:21 +00:00
collection_report.rb
Allow reporting (local) Collections (#37848)
2026-02-13 11:11:44 +00:00
collection.rb
Issue FeatureAuthorizations (#38004)
2026-02-27 11:00:21 +00:00
content_retention_policy.rb
…
context.rb
…
conversation_mute.rb
…
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 '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream
2026-01-20 16:14:14 +01:00
custom_filter_keyword.rb
Merge commit from fork
2026-01-20 15:13:10 +01:00
custom_filter_status.rb
…
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
…
email_domain_block.rb
…
export.rb
Fix bookmarks export when one bookmarked status is soft-deleted (#36576)
2025-10-23 11:51:23 +00:00
extended_description.rb
…
fasp.rb
…
favourite.rb
…
featured_tag.rb
Use normalizes for tag name attribute (#37119)
2026-02-27 15:56:08 +00:00
feed.rb
…
follow_recommendation_filter.rb
…
follow_recommendation_mute.rb
…
follow_recommendation_suppression.rb
…
follow_recommendation.rb
…
follow_request.rb
…
follow.rb
…
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
…
instance_filter.rb
…
instance_moderation_note.rb
…
instance.rb
…
invite_filter.rb
…
invite.rb
…
ip_block.rb
Add IpBlock#to_cidr method to build string (#35773)
2025-11-17 14:51:05 +00:00
link_feed.rb
Add disabled setting for live and topic feeds, as well as user permission to bypass that (#36563)
2025-10-23 08:37:05 +00:00
list_account.rb
…
list_feed.rb
…
list.rb
Merge commit from fork
2026-01-20 15:13:10 +01:00
login_activity.rb
…
marker.rb
…
media_attachment.rb
Merge commit '3df8fb8fe9d33c7fbe51aa0a418b8b9ca46bb61b' into glitch-soc/merge-upstream
2026-02-18 18:40:03 +01:00
mention.rb
…
mute.rb
…
notification_group.rb
…
notification_permission.rb
…
notification_policy.rb
…
notification_request.rb
…
notification.rb
…
poll_vote.rb
…
poll.rb
…
preview_card_provider.rb
…
preview_card_trend.rb
…
preview_card.rb
Remove deprecated usage of imagemagick (#37488)
2026-01-22 14:57:19 +00:00
preview_cards_status.rb
…
privacy_policy.rb
…
public_feed.rb
Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream
2025-10-23 18:33:52 +02:00
quote.rb
Fix quote cache invalidation (#37592)
2026-01-23 13:35:43 +00:00
relationship_filter.rb
…
relationship_severance_event.rb
…
relay.rb
…
remote_follow.rb
…
report_filter.rb
…
report_note.rb
…
report.rb
Allow reporting (local) Collections (#37848)
2026-02-13 11:11:44 +00:00
rule_translation.rb
…
rule.rb
…
scheduled_status.rb
…
search.rb
…
session_activation.rb
Improve SessionActivation.activate spec (#36983)
2025-11-26 10:26:39 +00:00
setting.rb
…
severed_relationship.rb
…
site_upload.rb
…
software_update.rb
…
status_edit.rb
Merge commit '0219b7cad7d9ef800f82cc561571b70da040433f' into glitch-soc/merge-upstream
2025-10-10 19:01:35 +02:00
status_pin.rb
…
status_stat.rb
…
status_trend.rb
…
status.rb
Fix Ruby linting for glitch-soc code
2026-02-18 18:47:21 +01:00
tag_feed.rb
Merge commit '1ba579b0a181fbfff514ef32b50179d2ab1fc342' into glitch-soc/merge-upstream
2025-10-23 18:33:52 +02:00
tag_follow.rb
…
tag_trend.rb
…
tag.rb
Use normalizes for tag name attribute (#37119)
2026-02-27 15:56:08 +00:00
terms_of_service.rb
…
tombstone.rb
…
translation.rb
…
trends.rb
…
unavailable_domain.rb
…
user_invite_request.rb
…
user_ip.rb
…
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 'ca9966ce2ff79dcac90b2feced65fa991534d53e' into glitch-soc/merge-upstream
2026-02-11 20:26:56 +01:00
username_block.rb
…
web.rb
…
webauthn_credential.rb
…
webhook.rb
…
worker_batch.rb
…