Claire b61c3ddff8 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged.		2022-01-16 18:11:20 +01:00
..
account_suggestions	Change auto-following admin-selected accounts, show in recommendations (#16078)	2021-04-24 17:01:43 +02:00
admin	Add ability for admins to delete canonical email blocks (#16644)	2021-12-17 23:02:14 +01:00
concerns	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
form
trends
web
account.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-16 18:11:20 +01:00
account_alias.rb
account_conversation.rb
account_deletion_request.rb
account_domain_block.rb	Fix crash when saving invalid domain name (#11528)	2019-08-08 23:04:19 +02:00
account_filter.rb
account_migration.rb
account_moderation_note.rb
account_note.rb
account_pin.rb
account_stat.rb	Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915)	2021-11-18 22:02:08 +01:00
account_statuses_cleanup_policy.rb
account_suggestions.rb
account_summary.rb	Fix FollowRecommendationsScheduler failing because of unpopulated views (#16189)	2021-05-09 10:39:29 +02:00
account_warning.rb
account_warning_preset.rb
admin.rb
announcement.rb
announcement_filter.rb
announcement_mute.rb
announcement_reaction.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
canonical_email_block.rb
context.rb
conversation.rb
conversation_mute.rb
custom_emoji.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-30 00:01:20 +02:00
custom_emoji_category.rb	Add batch actions and categories to admin UI for custom emojis (#11793)	2019-09-09 22:44:17 +02:00
custom_emoji_filter.rb
custom_filter.rb
device.rb
direct_feed.rb
domain_allow.rb
domain_block.rb
email_domain_block.rb
encrypted_message.rb
export.rb
favourite.rb
featured_tag.rb
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
mention.rb
message_franking.rb
mute.rb
notification.rb
one_time_key.rb
poll.rb
poll_vote.rb	Add optimistic lock to avoid race conditions when handling votes (#10196)	2019-03-06 19:53:57 +01:00
preview_card.rb
preview_card_filter.rb
preview_card_provider.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
preview_card_provider_filter.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_pin.rb
status_stat.rb
system_key.rb
tag.rb
tag_feed.rb
tag_filter.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	Add "why do you want to join" field to invite requests (#10524)	2019-04-09 23:06:30 +09:00
user_ip.rb
web.rb
webauthn_credential.rb