Claire f5c0c32edd Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/material-icons/400-24px/chat.svg`: Glitch-soc used this one but not upstream. Upstream pulled a presumably more up-to-date version of the file. Switched to upstream's version. - `app/views/layouts/application.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/embedded.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/error.html.haml`: Upstream removed use of font-awesome. I hope we are ready.		2024-08-20 18:31:50 +02:00
..
account	…
account_suggestions	Fix in memoriam accounts appearing in follow recommendations (#31474)	2024-08-19 15:55:42 +00:00
admin	Implement UI for Admin Search of Hashtags (#30880)	2024-07-29 15:49:44 +00:00
concerns	Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream	2024-07-12 13:41:54 +02:00
form	Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream	2024-05-06 17:53:51 +02:00
trends	Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream	2024-08-19 18:25:31 +02:00
user_settings	…
web	Add expired/revoked scopes for doorkeeper models via extension modules (#29936)	2024-06-11 08:50:51 +00:00
account.rb	Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream	2024-08-19 18:25:31 +02:00
account_alias.rb	…
account_conversation.rb	…
account_deletion_request.rb	…
account_domain_block.rb	…
account_filter.rb	…
account_migration.rb	…
account_moderation_note.rb	Improve Report Notes and Account Moderation Notes (#30288)	2024-05-15 13:38:36 +00:00
account_note.rb	Extract constants for column size length validation limits (#30045)	2024-04-24 08:56:28 +00:00
account_pin.rb	…
account_relationship_severance_event.rb	Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately (#29714)	2024-03-22 15:44:31 +00:00
account_stat.rb	Add `AccountStat.by_recent_status`, use in `Account` (#29704)	2024-03-26 13:12:09 +00:00
account_statuses_cleanup_policy.rb	…
account_suggestions.rb	…
account_summary.rb	…
account_warning.rb	Pull out constant from `AccountWarning.recent` scope (#29767)	2024-03-27 14:08:04 +00:00
account_warning_preset.rb	…
admin.rb	…
announcement.rb	Change `/api/v1/announcements` to return regular `Status` entities (#26736)	2024-04-17 09:06:23 +00:00
announcement_filter.rb	…
announcement_mute.rb	…
announcement_reaction.rb	…
appeal.rb	Extract `TEXT_LENGTH_LIMIT` constant in `Appeal` class (#30638)	2024-06-10 15:23:17 +00:00
application_record.rb	Prevent accidental serialization of `Account` and `User` records (#30079)	2024-04-29 09:45:58 +00:00
backup.rb	…
block.rb	…
bookmark.rb	…
bulk_import.rb	Use enum-generated scopes/queries for `BulkImport` (#29975)	2024-04-18 10:13:35 +00:00
bulk_import_row.rb	…
canonical_email_block.rb	Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385)	2024-05-21 08:56:08 +00:00
content_retention_policy.rb	…
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream	2024-06-07 20:30:51 +02:00
custom_emoji_category.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	Remove unused memoization in `CustomFilter#expires_in` method (#30117)	2024-04-29 12:49:31 +00:00
custom_filter_keyword.rb	Extract shared callback behaviour to `CustomFilterCache` concern (#29695)	2024-04-05 09:17:58 +00:00
custom_filter_status.rb	Extract shared callback behaviour to `CustomFilterCache` concern (#29695)	2024-04-05 09:17:58 +00:00
device.rb	…
direct_feed.rb	…
domain_allow.rb	…
domain_block.rb	Extract `by_domain_length` scope in `DomainNormalizable` concern (#29517)	2024-03-12 13:09:11 +00:00
email_domain_block.rb	Extract `by_domain_length` scope in `DomainNormalizable` concern (#29517)	2024-03-12 13:09:11 +00:00
encrypted_message.rb	…
export.rb	…
extended_description.rb	…
favourite.rb	…
featured_tag.rb	Add scope `Status.distributable_visibility` (#29950)	2024-04-16 13:16:54 +00:00
feed.rb	Remove caching in `cache_collection` (#29862)	2024-04-08 13:46:13 +00:00
follow.rb	…
follow_recommendation.rb	…
follow_recommendation_filter.rb	…
follow_recommendation_mute.rb	…
follow_recommendation_suppression.rb	…
follow_request.rb	…
generated_annual_report.rb	…
home_feed.rb	…
identity.rb	…
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	Fix `Rails/WhereRange` cop (#30343)	2024-05-20 09:37:36 +00:00
invite_filter.rb	…
ip_block.rb	Use enum-generated scope for `IpBlock` in CLI (#28144)	2024-03-14 09:31:15 +00:00
link_feed.rb	Add timeline of public posts about a trending link to REST API (#30381)	2024-06-06 08:43:04 +00:00
list.rb	…
list_account.rb	…
list_feed.rb	…
login_activity.rb	Add `BrowserDetection` model concern (#29513)	2024-03-19 15:39:14 +00:00
marker.rb	…
media_attachment.rb	Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream	2024-08-14 21:17:43 +02:00
mention.rb	Fix `mentions.account_id` and `mentions.status_id` not having `NOT NULL` database constraints (#30591)	2024-06-07 13:45:11 +00:00
message_franking.rb	…
mute.rb	…
notification.rb	Fix pagination parameters in `GET /api/v2_alpha/notificatins` (#31509)	2024-08-20 13:54:08 +00:00
notification_group.rb	Grouped Notifications UI (#30440)	2024-07-18 14:36:09 +00:00
notification_permission.rb	Add notification policies and notification requests (#29366)	2024-03-07 14:53:37 +00:00
notification_policy.rb	Revamp notification policy options (#31343)	2024-08-09 13:30:55 +00:00
notification_request.rb	Change notification requests to only count mentions (#31322)	2024-08-07 11:12:36 +00:00
one_time_key.rb	…
poll.rb	…
poll_vote.rb	…
preview_card.rb	Add size limit for all PreviewCard URLs (#30973)	2024-07-09 13:11:34 +00:00
preview_card_provider.rb	Extract `by_domain_length` scope in `DomainNormalizable` concern (#29517)	2024-03-12 13:09:11 +00:00
preview_card_trend.rb	Add `not_allowed` scope for `PreviewCardTrend` (#29599)	2024-03-26 13:21:20 +00:00
preview_cards_status.rb	…
privacy_policy.rb	…
public_feed.rb	Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +02:00
relationship_filter.rb	Add `AccountStat.by_recent_status`, use in `Account` (#29704)	2024-03-26 13:12:09 +00:00
relationship_severance_event.rb	Update `enum` away from deprecated (#29678)	2024-03-21 08:32:35 +00:00
relay.rb	…
remote_follow.rb	…
report.rb	Add optional OAuth application to reports (#30539)	2024-07-16 13:23:08 +00:00
report_filter.rb	…
report_note.rb	Improve Report Notes and Account Moderation Notes (#30288)	2024-05-15 13:38:36 +00:00
rule.rb	Extract constants for column size length validation limits (#30045)	2024-04-24 08:56:28 +00:00
scheduled_status.rb	…
search.rb	…
session_activation.rb	Add `BrowserDetection` model concern (#29513)	2024-03-19 15:39:14 +00:00
setting.rb	…
severed_relationship.rb	Use existing `SeveredRelationship.about_local_account` scope in more places (#29673)	2024-03-21 08:36:49 +00:00
site_upload.rb	Drop favicon.ico generation (#30375)	2024-06-26 13:44:08 +00:00
software_update.rb	…
status.rb	Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream	2024-07-08 19:41:14 +02:00
status_edit.rb	Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream	2024-07-08 19:41:14 +02:00
status_pin.rb	…
status_stat.rb	…
status_trend.rb	Add `RankedTrend` concern for trends classes (#29388)	2024-02-26 13:45:39 +00:00
system_key.rb	…
tag.rb	Implement UI for Admin Search of Hashtags (#30880)	2024-07-29 15:49:44 +00:00
tag_feed.rb	Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +02:00
tag_follow.rb	…
tombstone.rb	…
translation.rb	…
trends.rb	…
unavailable_domain.rb	…
user.rb	Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream	2024-08-14 21:17:43 +02:00
user_invite_request.rb	Extract constants for column size length validation limits (#30045)	2024-04-24 08:56:28 +00:00
user_ip.rb	Add `by_latest_used` scope, move admin area recent IPs to partial (#29497)	2024-04-02 13:51:34 +00:00
user_role.rb	Move `nobody` position in `UserRole` magic number to constant (#29465)	2024-03-01 11:05:24 +00:00
user_settings.rb	Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream	2024-07-12 13:41:54 +02:00
web.rb	…
webauthn_credential.rb	Extract `SIGN_COUNT_LIMIT` constant in `WebauthnCredential` class (#30636)	2024-06-11 15:36:21 +00:00
webhook.rb	…