Claire dfc05ec8df Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream modified this file close to a line modified by glitch-soc to disable the ARMv64 builder (as glitch-soc doesn't have one). Ported upstream's changes. - `.github/workflows/build-releases.yml`: Upstream modified this file close to lines changed by glitch-soc to change the Docker image repositories used (only ghcr, and based on the organization's name). Ported upstream's changes.		2023-09-15 21:43:49 +02:00
..
account	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
account_suggestions	Fix Performance/MapCompact cop (#24797)	2023-05-23 10:49:12 +02:00
admin	Fix moderator rights inconsistencies (#26729)	2023-09-06 16:40:19 +02:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2023-09-05 20:34:17 +02:00
form	Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream	2023-09-02 14:44:47 +02:00
trends	Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream	2023-09-15 21:39:21 +02:00
user_settings	Add privacy tab in profile settings (#26484)	2023-08-14 18:52:45 +02:00
web	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
account.rb	Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream	2023-09-15 21:06:45 +02:00
account_alias.rb	Fix `Style/SlicingWithRange` cop (#25923)	2023-07-12 10:03:06 +02:00
account_conversation.rb	Fix /api/v1/conversations sometimes returning empty accounts (#25499)	2023-06-20 18:32:26 +02:00
account_deletion_request.rb	…
account_domain_block.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
account_filter.rb	Change moderation search an account using the username with @ (#24242)	2023-04-17 14:16:36 +02:00
account_migration.rb	Rename `with_lock` to `with_redis_lock` to avoid confusion with ActiveRecord's method (#24741)	2023-05-02 18:16:07 +02:00
account_moderation_note.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
account_note.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
account_pin.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
account_stat.rb	Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761)	2023-03-31 15:07:22 +02:00
account_statuses_cleanup_policy.rb	Fix Performance/MapCompact cop (#24797)	2023-05-23 10:49:12 +02:00
account_suggestions.rb	…
account_summary.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
account_warning.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
account_warning_preset.rb	…
admin.rb	…
announcement.rb	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +02:00
announcement_filter.rb	…
announcement_mute.rb	…
announcement_reaction.rb	Fix Rails/ActiveRecordCallbacksOrder cop (#24689)	2023-05-02 18:23:35 +02:00
appeal.rb	Fix Rails/InverseOf cop (#24732)	2023-04-30 14:06:53 +02:00
application_record.rb	Change `DB_REPLICA_*` environment variables to `REPLICA_DB_*` (#26386)	2023-08-08 13:59:40 +02:00
backup.rb	Fix user archive takeout when using OpenStack Swift or S3 providers with no ACL support (#24200)	2023-03-27 17:07:37 +02:00
block.rb	Fix Rails/ActiveRecordCallbacksOrder cop (#24689)	2023-05-02 18:23:35 +02:00
bookmark.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
bulk_import.rb	Add support for importing lists (#25203)	2023-06-01 14:47:31 +02:00
bulk_import_row.rb	Rewrite import feature (#21054)	2023-05-02 12:08:48 +02:00
canonical_email_block.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
content_retention_policy.rb	…
context.rb	…
conversation.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
conversation_mute.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
custom_emoji.rb	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream	2023-05-08 15:28:36 +02:00
custom_emoji_category.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761)	2023-03-31 15:07:22 +02:00
custom_filter_keyword.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
custom_filter_status.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
device.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
direct_feed.rb	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
domain_allow.rb	Autofix Rubocop Regex Style rules (#23690)	2023-06-06 14:50:51 +02:00
domain_block.rb	Fix `Style/SlicingWithRange` cop (#25923)	2023-07-12 10:03:06 +02:00
email_domain_block.rb	Fix `Style/SlicingWithRange` cop (#25923)	2023-07-12 10:03:06 +02:00
encrypted_message.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
export.rb	…
extended_description.rb	…
favourite.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
featured_tag.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
feed.rb	…
follow.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
follow_recommendation.rb	Change follow recommendation materialized view to be faster in most cases (#26545)	2023-08-18 18:20:55 +02:00
follow_recommendation_filter.rb	Fix Performance/MapCompact cop (#24797)	2023-05-23 10:49:12 +02:00
follow_recommendation_suppression.rb	Upgrade to latest redis-rb 4.x and fix deprecations (#23616)	2023-03-04 16:38:28 +01:00
follow_request.rb	Change lists to be able to include accounts with pending follow requests (#19727)	2023-05-02 14:40:36 +02:00
home_feed.rb	…
identity.rb	Change Identity to not destroy associated User on destroy (#25098)	2023-05-23 15:00:36 +02:00
import.rb	Rewrite import feature (#21054)	2023-05-02 12:08:48 +02:00
instance.rb	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00
instance_filter.rb	…
invite.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
invite_filter.rb	…
ip_block.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
list.rb	Fix incorrect model annotation for List#exclusive (#26313)	2023-08-04 09:00:31 +02:00
list_account.rb	Fix various edge cases with local moves (#24812)	2023-05-03 19:19:25 +02:00
list_feed.rb	…
login_activity.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
marker.rb	…
media_attachment.rb	Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream	2023-09-15 21:43:49 +02:00
mention.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
message_franking.rb	…
mute.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
notification.rb	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +02:00
one_time_key.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
poll.rb	Fix obsolete cache key in status cache invalidation logic (#26934)	2023-09-15 19:52:28 +02:00
poll_vote.rb	Fix single-record invalid condition on PollVote (#23810)	2023-02-27 09:31:15 +01:00
preview_card.rb	Add alt text for preview card thumbnails (#26184)	2023-08-03 15:41:51 +02:00
preview_card_provider.rb	Fix `Style/SlicingWithRange` cop (#25923)	2023-07-12 10:03:06 +02:00
preview_card_trend.rb	…
privacy_policy.rb	…
public_feed.rb	Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream	2023-08-24 21:50:14 +02:00
relationship_filter.rb	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
relay.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
remote_follow.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
report.rb	Fix “legal” report category not showing up in moderation interface (#26509)	2023-08-16 16:38:33 +02:00
report_filter.rb	…
report_note.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
rule.rb	…
scheduled_status.rb	…
search.rb	…
session_activation.rb	Fix Rails/ActiveRecordCallbacksOrder cop (#24689)	2023-05-02 18:23:35 +02:00
setting.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
site_upload.rb	Autofix Rubocop Regex Style rules (#23690)	2023-06-06 14:50:51 +02:00
software_update.rb	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
status.rb	Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream	2023-09-02 13:34:54 +02:00
status_edit.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-31 21:30:27 +02:00
status_pin.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
status_stat.rb	Fix obsolete cache key in status cache invalidation logic (#26934)	2023-09-15 19:52:28 +02:00
status_trend.rb	…
system_key.rb	…
tag.rb	Added admin api for managing tags (#26872)	2023-09-13 11:22:53 +02:00
tag_feed.rb	…
tag_follow.rb	…
tombstone.rb	…
translation.rb	Translate CW, poll options and media descriptions (#24175)	2023-06-01 00:10:21 +02:00
trends.rb	Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream	2023-07-12 15:38:35 +02:00
unavailable_domain.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
user.rb	Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream	2023-07-12 15:38:35 +02:00
user_invite_request.rb	…
user_ip.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
user_role.rb	Fix Performance/MapCompact cop (#24797)	2023-05-23 10:49:12 +02:00
user_settings.rb	Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	2023-09-02 15:02:29 +02:00
web.rb	…
webauthn_credential.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
webhook.rb	Add report.updated webhook (#24211)	2023-07-24 17:37:38 +02:00