Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		2022-05-01 16:52:27 +02:00
..
account_suggestions	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
admin	…
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
form	…
trends	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
web	…
account.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-27 08:48:21 +02:00
account_alias.rb	Fix crash in alias settings page (#18004)	2022-04-09 20:11:06 +02:00
account_conversation.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
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	…
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	…
custom_emoji_category.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
device.rb	…
direct_feed.rb	…
domain_allow.rb	…
domain_block.rb	…
email_domain_block.rb	Remove IP matching from e-mail domain blocks (#18190)	2022-04-29 23:27:03 +02:00
encrypted_message.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
export.rb	…
favourite.rb	…
featured_tag.rb	…
feed.rb	…
follow.rb	…
follow_recommendation.rb	…
follow_recommendation_filter.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
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	…
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	…
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	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
status_edit.rb	…
status_pin.rb	…
status_stat.rb	…
system_key.rb	…
tag.rb	…
tag_feed.rb	…
tombstone.rb	…
trends.rb	…
unavailable_domain.rb	…
user.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-28 18:16:42 +02:00
user_invite_request.rb	…
user_ip.rb	…
web.rb	…
webauthn_credential.rb	…