Claire aec61a703f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version.		2022-11-17 12:01:37 +01:00
..
account	Guard against error extracting `body` from URL (#20428)	2022-11-11 21:22:28 +01:00
account_suggestions	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
admin	Fix various issues with domain block import (#1944)	2022-11-17 11:42:20 +01:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
form	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
trends	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
web	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040)	2021-04-15 05:00:25 +02:00
account.rb	Fix trendable status without review (#20214)	2022-11-11 21:24:10 +01:00
account_alias.rb	Micro-optimization: only split `acct` into two Strings (#19901)	2022-11-07 16:17:55 +01:00
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 error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
account_migration.rb	Skip Webfinger cache during migrations as well (#19883)	2022-11-07 03:31:38 +01:00
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	Fix follower and other counters being able to go negative (#18517)	2022-05-26 20:32:48 +02:00
account_statuses_cleanup_policy.rb	Micro-optimization: use `if`/`else` instead of `Array#compact` and `Array#min` (#19906)	2022-11-08 03:50:47 +01:00
account_statuses_filter.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01: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	Fix FollowRecommendationsScheduler failing because of unpopulated views (#16189)	2021-05-09 10:39:29 +02:00
account_warning.rb	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +02:00
account_warning_preset.rb	…
admin.rb	…
announcement.rb	Change admin announcement edition interface to use datetime-local (#18321)	2022-10-28 12:56:32 +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	…
appeal.rb	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +02:00
application_record.rb	…
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	Add admin API for managing canonical e-mail blocks (#19067)	2022-08-28 03:31:54 +02: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	…
conversation_mute.rb	…
custom_emoji.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01: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	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
custom_filter_keyword.rb	Change how hashtags are normalized (#18795)	2022-07-13 15:03:28 +02:00
custom_filter_status.rb	Add ability to select all accounts matching search for batch actions (#19053)	2022-08-25 23:33:34 +02:00
device.rb	…
direct_feed.rb	…
domain_allow.rb	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
domain_block.rb	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
email_domain_block.rb	Add admin API for managing e-mail domain blocks (#19066)	2022-08-28 03:37:55 +02:00
encrypted_message.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02: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	Bump chewy from 5.2.0 to 7.2.3 (supports Elasticsearch 7.x) (#16915)	2021-11-18 22:02:08 +01:00
featured_tag.rb	Improve performance by avoiding regex construction (#20215)	2022-11-10 05:49:30 +01:00
feed.rb	…
follow.rb	Add ability to filter followed accounts' posts by language (#19095)	2022-09-20 23:51:21 +02:00
follow_recommendation.rb	Fix FollowRecommendationsScheduler failing because of unpopulated views (#16189)	2021-05-09 10:39:29 +02:00
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	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00
follow_request.rb	Add ability to filter followed accounts' posts by language (#19095)	2022-09-20 23:51:21 +02:00
home_feed.rb	Revert support from loading Home timeline from database	2022-04-19 15:06:38 +02:00
identity.rb	…
import.rb	…
instance.rb	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +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	…
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	Fix IP blocks not having a unique index (#19456)	2022-10-25 21:43:44 +02:00
list.rb	…
list_account.rb	…
list_feed.rb	…
login_activity.rb	Add authentication history (#16408)	2021-06-21 17:07:30 +02:00
marker.rb	…
media_attachment.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
mention.rb	…
message_franking.rb	…
mute.rb	Various code cleanup (#1782)	2022-05-25 12:27:11 +02:00
notification.rb	Add notifications for new reports (#18697)	2022-06-27 09:30:15 +02:00
one_time_key.rb	…
poll.rb	Fix regression in `tootctl search deploy` caused by unloaded attribute (#18514)	2022-05-26 18:05:47 +02:00
poll_vote.rb	…
preview_card.rb	Fix metadata scrubbing removing color profile from images (#20389)	2022-11-11 09:20:10 +01:00
preview_card_provider.rb	Fix metadata scrubbing removing color profile from images (#20389)	2022-11-11 09:20:10 +01: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 branch 'main' into glitch-soc/merge-upstream	2022-11-10 09:36:47 +01:00
relationship_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
relay.rb	…
remote_follow.rb	…
report.rb	Fix notifications about deleted reports not being also deleted (#19475)	2022-10-27 02:10:54 +02:00
report_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00
report_note.rb	…
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	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
setting.rb	…
site_upload.rb	Fix metadata scrubbing removing color profile from images (#20389)	2022-11-11 09:20:10 +01:00
status.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
status_edit.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
status_pin.rb	Add feature to automatically delete old toots (#16529)	2021-08-09 23:11:50 +02:00
status_stat.rb	Fix follower and other counters being able to go negative (#18517)	2022-05-26 20:32:48 +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	…
tag.rb	Improve performance by avoiding regex construction (#20215)	2022-11-10 05:49:30 +01: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	…
trends.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
unavailable_domain.rb	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +02:00
user.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
user_invite_request.rb	…
user_ip.rb	Remove IP tracking columns from users table (#16409)	2022-01-16 13:23:50 +01:00
user_role.rb	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +02:00
web.rb	…
webauthn_credential.rb	…
webhook.rb	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +02:00