Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.		2022-11-10 09:36:47 +01:00
..
account	Change link verification to ignore IDN domains (#20295)	2022-11-10 06:27:45 +01:00
account_suggestions
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
concerns
form	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 18:15:28 +01:00
trends
web
account.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
account_alias.rb	Micro-optimization: only split acct into two Strings (#19901)	2022-11-07 16:17:55 +01:00
account_conversation.rb
account_deletion_request.rb
account_domain_block.rb
account_filter.rb
account_migration.rb	Skip Webfinger cache during migrations as well (#19883)	2022-11-07 03:31:38 +01:00
account_moderation_note.rb
account_note.rb
account_pin.rb
account_stat.rb
account_statuses_cleanup_policy.rb	Micro-optimization: use if/else instead of Array#compact and Array#min (#19906)	2022-11-08 03:50:47 +01:00
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	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
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
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-11-06 09:50:41 +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	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
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	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
status_edit.rb
status_pin.rb
status_stat.rb
status_trend.rb
system_key.rb
tag.rb	Improve performance by avoiding regex construction (#20215)	2022-11-10 05:49:30 +01:00
tag_feed.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
tag_follow.rb
tombstone.rb	Record deleted(by mod) status to prevent re-appear (#10732)	2019-05-09 22:03:02 +02:00
trends.rb
unavailable_domain.rb
user.rb
user_invite_request.rb
user_ip.rb
user_role.rb
web.rb
webauthn_credential.rb
webhook.rb