Claire bf153b384b Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/auth/passwords_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict. - `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`: Upstream refactored, changing lines textually close of glitch-soc-only lines pertaining to the theming system. Resolved the conflict.		2024-01-27 19:06:41 +01:00
..
account	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
account_suggestions	Move followable by logic to suggestion class (#28710)	2024-01-12 13:09:33 +00:00
admin	Add `Account.auditable` scope, fix N+1 in admin/action_logs#index (#28812)	2024-01-19 01:39:30 +00:00
concerns	Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream	2024-01-18 22:16:16 +01:00
form	Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream	2024-01-15 20:27:41 +01:00
trends	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
user_settings	Fix `Lint/SymbolConversion` cop (#28175)	2023-12-01 15:53:35 +00:00
web	Add explicit `dependent: nil` to associations (#28169)	2023-12-01 15:52:47 +00:00
account.rb	Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream	2024-01-22 19:19:40 +01:00
account_alias.rb	Use Rails 7.1 `normalizes` feature (#27521)	2023-10-24 10:06:10 +00: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	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00:00
account_filter.rb	Replace unused `by_recent_sign_in` scope (#28616)	2024-01-08 15:31:13 +00:00
account_migration.rb	Use Rails 7.1 `normalizes` feature (#27521)	2023-10-24 10:06:10 +00: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	Eager loading fixes for `api/` controllers (#28848)	2024-01-23 11:41:54 +00:00
account_summary.rb	Simplify `AccountSummary.filtered` query generation (#28868)	2024-01-24 09:57:32 +00:00
account_warning.rb	Use Rails 7.1 `normalizes` feature (#27521)	2023-10-24 10:06:10 +00:00
account_warning_preset.rb	…
admin.rb	…
announcement.rb	Announcement reactions query spec improvement and refactor (#28768)	2024-01-17 09:18:13 +00: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	Group common `class_name` options in associations (#28779)	2024-01-18 12:29:41 +00:00
application_record.rb	Fix ActiveRecord using two connection pools when no replica is defined (#27061)	2023-09-22 16:01:59 +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	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00:00
bookmark.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
bulk_import.rb	Disable `Rails/SkipsModelValidations` cop (#28712)	2024-01-15 13:46:47 +00: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	Add explicit `dependent: nil` to associations (#28169)	2023-12-01 15:52:47 +00:00
conversation_mute.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
custom_emoji.rb	Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream	2024-01-10 18:41:04 +01:00
custom_emoji_category.rb	Add explicit `dependent: nil` to associations (#28169)	2023-12-01 15:52:47 +00:00
custom_emoji_filter.rb	Use Arel `nulls_first` method in ordering CustomEmojiFilter scope (#28614)	2024-01-08 11:09:50 +00:00
custom_filter.rb	Add `CustomFilterKeyword#to_regex` method (#28893)	2024-01-25 13:00:34 +00:00
custom_filter_keyword.rb	Add `CustomFilterKeyword#to_regex` method (#28893)	2024-01-25 13:00:34 +00: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	Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock (#28803)	2024-01-18 16:11:04 +00:00
domain_block.rb	Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock (#28803)	2024-01-18 16:11:04 +00:00
email_domain_block.rb	Group common `class_name` options in associations (#28779)	2024-01-18 12:29:41 +00: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	Extract shared tagged statuses method in `FeaturedTag` (#28805)	2024-01-18 16:14:15 +00:00
feed.rb	Fix `Performance/MapMethodChain` cop (#27744)	2023-11-07 13:01:09 +00:00
follow.rb	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00: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	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00:00
follow_recommendation_mute.rb	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00:00
follow_recommendation_suppression.rb	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00:00
follow_request.rb	Disable `Rails/SkipsModelValidations` cop (#28712)	2024-01-15 13:46:47 +00:00
generated_annual_report.rb	Add annual reports for accounts (#28693)	2024-01-24 09:38:10 +00: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	Add specs for `Instance` model scopes and add `with_domain_follows` scope (#28767)	2024-01-25 15:28:27 +00:00
instance_filter.rb	…
invite.rb	Add explicit `dependent: nil` to associations (#28169)	2023-12-01 15:52:47 +00: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 '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream	2024-01-25 19:51:19 +01:00
mention.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
message_franking.rb	…
mute.rb	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00:00
notification.rb	Fix N+1s because of association preloaders not actually getting called (#28339)	2023-12-13 07:47:32 +00:00
one_time_key.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
poll.rb	Fix `Rails/WhereExists` cop in app/models (#28863)	2024-01-24 09:57:49 +00:00
poll_vote.rb	Fix single-record invalid condition on PollVote (#23810)	2023-02-27 09:31:15 +01:00
preview_card.rb	Change link previews to keep original URL from the status (#27312)	2023-11-13 09:58:28 +00:00
preview_card_provider.rb	Properly remove tIME chunk from PNG uploads (#27111)	2023-09-25 19:21:07 +02:00
preview_card_trend.rb	…
preview_cards_status.rb	Change algorithm of follow recommendations (#28314)	2023-12-19 10:59:43 +00:00
privacy_policy.rb	Move privacy policy into markdown file (#28699)	2024-01-19 11:22:23 +00:00
public_feed.rb	Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream	2023-08-24 21:50:14 +02:00
relationship_filter.rb	Fix crash when filtering for “dormant” relationships (#27306)	2023-10-06 12:58:16 +02:00
relay.rb	Use Rails 7.1 `normalizes` feature (#27521)	2023-10-24 10:06:10 +00:00
remote_follow.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
report.rb	Eager loading fixes for `api/` controllers (#28848)	2024-01-23 11:41:54 +00:00
report_filter.rb	Fix deprecation warning about `rewhere: true` being default behavior (Rails 7.1 prep) (#27190)	2023-09-28 16:52:23 +02:00
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/WhereExists` cop in app/models (#28863)	2024-01-24 09:57:49 +00:00
setting.rb	Clean up `Setting` model and remove dead code (#28661)	2024-01-09 14:01:53 +00:00
site_upload.rb	Properly remove tIME chunk from PNG uploads (#27111)	2023-09-25 19:21:07 +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 '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream	2024-01-25 19:51:19 +01:00
status_edit.rb	Merge commit '973597c6f1e25b16c592e5573304319aeaa375e1' into glitch-soc/merge-upstream	2023-12-19 20:51:37 +01: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	Fix trending statuses returning more than one post by the same author (#19349)	2022-10-14 01:44:23 +02:00
system_key.rb	Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681)	2023-02-18 04:30:23 +01:00
tag.rb	Add coverage for `Tag.recently_used` scope (#28850)	2024-01-23 09:10:11 +00: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 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream	2024-01-18 22:16:16 +01: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	Refactor, lint fix, and bug fix on admin/roles/form partial (#27558)	2023-11-29 10:00:52 +00: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	Use `normalizes` to prepare `Webhook#events` value (#27605)	2023-11-13 22:47:44 +00:00