Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2022-06-28 11:11:18 +02:00
..
account_suggestions
admin
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02:00
form
trends
web
account.rb
account_alias.rb
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	Fix /api/v1/admin/accounts (#17887)	2022-03-28 23:57:38 +02:00
account_migration.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
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	Change auto-following admin-selected accounts, show in recommendations (#16078)	2021-04-24 17:01:43 +02:00
account_summary.rb
account_warning.rb
account_warning_preset.rb	Add titles to warning presets in admin UI (#13252)	2020-03-12 17:57:59 +01:00
admin.rb
announcement.rb
announcement_filter.rb
announcement_mute.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
announcement_reaction.rb
appeal.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
canonical_email_block.rb
context.rb
conversation.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
conversation_mute.rb
custom_emoji.rb
custom_emoji_category.rb
custom_emoji_filter.rb
custom_filter.rb
custom_filter_keyword.rb	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
device.rb
direct_feed.rb
domain_allow.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02:00
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	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
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	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +02:00
report_filter.rb
report_note.rb
rule.rb
scheduled_status.rb	Fix deleting a scheduled status immediately deleting media attachments (#9728)	2019-01-06 16:38:40 +01:00
search.rb
session_activation.rb	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
setting.rb
site_upload.rb
status.rb
status_edit.rb
status_pin.rb
status_stat.rb
system_key.rb
tag.rb
tag_feed.rb
tombstone.rb
trends.rb
unavailable_domain.rb	Fix performance on instances list in admin UI (#15282)	2020-12-14 09:06:34 +01:00
user.rb
user_invite_request.rb
user_ip.rb
web.rb
webauthn_credential.rb
webhook.rb