Claire 3e63fcd4f0 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.		2023-01-12 10:15:46 +01:00
..
account	Don't allow URLs that contain non-normalized paths to be verified (#20999)	2022-11-20 19:28:13 +01:00
account_suggestions
admin	Fix various issues with domain block import (#1944)	2022-11-17 11:42:20 +01:00
concerns
form	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-05 14:16:25 +01:00
trends
web	Add policy param to POST /api/v1/push/subscriptions (#16040)	2021-04-15 05:00:25 +02:00
account.rb
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_stat.rb
account_statuses_cleanup_policy.rb
account_statuses_filter.rb
account_suggestions.rb
account_summary.rb
account_warning.rb
account_warning_preset.rb
admin.rb
announcement.rb
announcement_filter.rb
announcement_mute.rb
announcement_reaction.rb
appeal.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
canonical_email_block.rb
content_retention_policy.rb
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb
custom_filter_keyword.rb
custom_filter_status.rb
device.rb
direct_feed.rb
domain_allow.rb
domain_block.rb
email_domain_block.rb
encrypted_message.rb
export.rb
extended_description.rb
favourite.rb
featured_tag.rb	Improve performance by avoiding regex construction (#20215)	2022-11-10 05:49:30 +01:00
feed.rb
follow.rb
follow_recommendation.rb
follow_recommendation_filter.rb
follow_recommendation_suppression.rb
follow_request.rb
home_feed.rb	Revert support from loading Home timeline from database	2022-04-19 15:06:38 +02:00
identity.rb
import.rb
instance.rb
instance_filter.rb
invite.rb
invite_filter.rb
ip_block.rb
list.rb
list_account.rb
list_feed.rb
login_activity.rb
marker.rb
media_attachment.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
mention.rb
message_franking.rb
mute.rb
notification.rb
one_time_key.rb
poll.rb
poll_vote.rb
preview_card.rb
preview_card_provider.rb
preview_card_trend.rb
privacy_policy.rb
public_feed.rb
relationship_filter.rb
relay.rb
remote_follow.rb
report.rb
report_filter.rb
report_note.rb
rule.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb
status_edit.rb
status_pin.rb
status_stat.rb
status_trend.rb
system_key.rb
tag.rb
tag_feed.rb
tag_follow.rb
tombstone.rb
trends.rb
unavailable_domain.rb
user.rb
user_invite_request.rb
user_ip.rb
user_role.rb
web.rb
webauthn_credential.rb
webhook.rb