Claire 1474318691 Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main ... Conflicts: - `app/models/trends/statuses.rb`: Upstream fixed a bug in the trending post condition. Glitch-soc's condition is different because we potentially allow CWed content to trend. Ported upstream's fix while keeping glitch-soc's change. - `config/initializers/content_security_policy.rb`: Kept our version for now, we will switch to upstream later down the road.		2023-12-17 15:32:29 +01: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 filtering audit log for entries about disabling 2FA (#27186)	2023-09-28 13:41:24 +02:00
concerns	Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream	2023-10-24 19:59:19 +02:00
form	Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream	2023-10-17 21:42:49 +02:00
trends	Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main	2023-12-17 15:32:29 +01: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 '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream	2023-10-08 17:30:48 +02: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	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	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	Change auto-following admin-selected accounts, show in recommendations (#16078)	2021-04-24 17:01:43 +02:00
account_summary.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01: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	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +02:00
announcement_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
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	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	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	Add retention policy for cached content and media (#19232)	2022-09-27 03:08:19 +02:00
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 '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +02:00
custom_emoji_category.rb	…
custom_emoji_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
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	Add ability to filter followed accounts' posts by language (#19095)	2022-09-20 23:51:21 +02:00
extended_description.rb	Change about page to be mounted in the web UI (#19345)	2022-10-13 14:42:37 +02:00
favourite.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
featured_tag.rb	Use Rails 7.1 `normalizes` feature (#27521)	2023-10-24 10:06:10 +00: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	Revert support from loading Home timeline from database	2022-04-19 15:06:38 +02:00
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	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
invite.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
invite_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
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	Fix rubocop config and warnings (#15503)	2021-01-07 09:40:55 +01:00
login_activity.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
marker.rb	…
media_attachment.rb	Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream	2023-09-26 13:13:27 +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	Validate allowed schemes on preview card URLs (#27485)	2023-10-23 09:50:02 +02: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	Add support for language preferences for trending statuses and links (#18288)	2022-10-08 16:45:40 +02:00
privacy_policy.rb	Fix privacy policy being empty if custom setting exists but is empty (#19318)	2022-10-08 08:34:00 +02: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	Add warnings to report action logs (#27425)	2023-10-23 14:30:46 +02: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	Fix rules with same priority being sorted non-deterministically (#20623)	2022-11-14 06:28:19 +01:00
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	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 '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	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	Fix hashtag matching pattern matching some URLs (#27584)	2023-10-27 14:04:51 +00:00
tag_feed.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
tag_follow.rb	Add ability to follow hashtags (#18809)	2022-07-17 13:49:29 +02:00
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 '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +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	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