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
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
account_alias.rb
account_conversation.rb
account_deletion_request.rb	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
account_domain_block.rb
account_filter.rb
account_migration.rb
account_moderation_note.rb
account_note.rb	Fix AccountNote not having a maximum length (#16942)	2021-11-06 00:12:25 +01:00
account_pin.rb
account_stat.rb
account_statuses_cleanup_policy.rb
account_statuses_filter.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
appeal.rb
application_record.rb	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
backup.rb
block.rb
bookmark.rb	Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915)	2021-11-18 22:02:08 +01:00
canonical_email_block.rb
context.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
conversation.rb
conversation_mute.rb
custom_emoji.rb
custom_emoji_category.rb
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	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00
follow_request.rb
home_feed.rb
identity.rb
import.rb	Fix follow limit preventing re-following of a moved account (#14207)	2020-12-18 09:18:31 +01:00
instance.rb
instance_filter.rb
invite.rb	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
invite_filter.rb
ip_block.rb
list.rb
list_account.rb
list_feed.rb	Fix rubocop config and warnings (#15503)	2021-01-07 09:40:55 +01:00
login_activity.rb
marker.rb
media_attachment.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-26 19:18:55 +01:00
mention.rb
message_franking.rb	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
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	Fix individually approved/rejected statuses/links showing as pending review (#17787)	2022-03-15 07:51:55 +01:00
preview_card_provider.rb
public_feed.rb
relationship_filter.rb
relay.rb
remote_follow.rb
report.rb	Change how changes to media attachments are stored for edits (#17696)	2022-03-09 09:06:17 +01:00
report_filter.rb
report_note.rb
rule.rb	Add server rules (#15769)	2021-02-21 19:50:12 +01:00
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	Reset status cache when status_stat or media_attachment updates (#9119)	2018-10-28 06:42:34 +01:00
system_key.rb
tag.rb	Fix error on trending hashtags/links pages in admin UI due to missing constant (#17044)	2021-11-26 01:12:39 +01:00
tag_feed.rb
tombstone.rb
trends.rb
unavailable_domain.rb
user.rb
user_invite_request.rb
user_ip.rb
web.rb
webauthn_credential.rb