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

Autofix Rubocop remaining Layout rules (#23679)

2023-02-20 06:58:28 +01:00

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

Fix Lint/SymbolConversion cop (#28175)

2023-12-01 15:53:35 +00:00

web

Add expired/revoked scopes for doorkeeper models via extension modules (#29936)

2024-06-11 08:50:51 +00: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

Change account suspensions to be reversible by default (#14726)

2020-09-15 14:37:58 +02:00

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

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

Autofix Rubocop remaining Layout rules (#23679)

2023-02-20 06:58:28 +01:00

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

Fix Performance/MapCompact cop (#24797)

2023-05-23 10:49:12 +02:00

account_suggestions.rb

Change source attribute of Suggestion entity in /api/v2/suggestions back to a string (#29108)

2024-02-06 17:10:17 +00:00

account_summary.rb

Extract scenic view model common methods to concern (#28111)

2024-02-06 09:08:07 +00:00

account_warning_preset.rb

Add titles to warning presets in admin UI (#13252)

2020-03-12 17:57:59 +01:00

account_warning.rb

Pull out constant from AccountWarning.recent scope (#29767)

2024-03-27 14:08:04 +00:00

account.rb

Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream

2024-08-19 18:25:31 +02:00

admin.rb

Add logging of admin actions (#5757)

2017-11-24 02:05:53 +01: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

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

announcement_reaction.rb

Fix Rails/ActiveRecordCallbacksOrder cop (#24689)

2023-05-02 18:23:35 +02:00

announcement.rb

Change /api/v1/announcements to return regular Status entities (#26736)

2024-04-17 09:06:23 +00:00

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

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_row.rb

Rewrite import feature (#21054)

2023-05-02 12:08:48 +02:00

bulk_import.rb

Use enum-generated scopes/queries for BulkImport (#29975)

2024-04-18 10:13:35 +00:00

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

Add retention policy for cached content and media (#19232)

2022-09-27 03:08:19 +02:00

context.rb

…

conversation_mute.rb

Autofix Rubocop remaining Layout rules (#23679)

2023-02-20 06:58:28 +01:00

conversation.rb

Add explicit dependent: nil to associations (#28169)

2023-12-01 15:52:47 +00: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_emoji.rb

Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream

2024-06-07 20:30:51 +02: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

custom_filter.rb

Remove unused memoization in CustomFilter#expires_in method (#30117)

2024-04-29 12:49:31 +00: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

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

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

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_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_recommendation.rb

Extract scenic view model common methods to concern (#28111)

2024-02-06 09:08:07 +00:00

follow_request.rb

Disable Rails/SkipsModelValidations cop (#28712)

2024-01-15 13:46:47 +00:00

follow.rb

Change algorithm of follow recommendations (#28314)

2023-12-19 10:59:43 +00:00

generated_annual_report.rb

Add annual reports for accounts (#28693)

2024-01-24 09:38:10 +00:00

home_feed.rb

Revert support from loading Home timeline from database

2022-04-19 15:06:38 +02:00

identity.rb

Merge pull request from GHSA-vm39-j3vx-pch3

2024-02-14 15:25:15 +01:00

import.rb

Update enum syntax to use the new Rails 7.0 style (#29217)

2024-02-16 14:54:23 +00:00

instance_filter.rb

Fix error when passing unknown filter param in REST API (#20626)

2022-11-14 08:06:06 +01:00

instance.rb

Extract scenic view model common methods to concern (#28111)

2024-02-06 09:08:07 +00:00

invite_filter.rb

Fix error when passing unknown filter param in REST API (#20626)

2022-11-14 08:06:06 +01:00

invite.rb

Fix Rails/WhereRange cop (#30343)

2024-05-20 09:37:36 +00:00

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_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

list.rb

Update enum syntax to use the new Rails 7.0 style (#29217)

2024-02-16 14:54:23 +00:00

login_activity.rb

Add BrowserDetection model concern (#29513)

2024-03-19 15:39:14 +00:00

marker.rb

Add timeline read markers API (#11762)

2019-09-06 13:55:51 +02:00

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

Add E2EE API (#13820)

2020-06-02 19:24:53 +02:00

mute.rb

Change algorithm of follow recommendations (#28314)

2023-12-19 10:59:43 +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

notification.rb

Fix pagination parameters in GET /api/v2_alpha/notificatins (#31509)

2024-08-20 13:54:08 +00:00

one_time_key.rb

Autofix Rubocop remaining Layout rules (#23679)

2023-02-20 06:58:28 +01:00

poll_vote.rb

Fix single-record invalid condition on PollVote (#23810)

2023-02-27 09:31:15 +01:00

poll.rb

Fix Rails/WhereExists cop in app/models (#28863)

2024-01-24 09:57:49 +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_card.rb

Add size limit for all PreviewCard URLs (#30973)

2024-07-09 13:11:34 +00:00

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 '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

Update enum syntax to use the new Rails 7.0 style (#29217)

2024-02-16 14:54:23 +00:00

remote_follow.rb

Autofix Rubocop Style/RedundantBegin (#23703)

2023-02-19 07:09:40 +09: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

Improve Report Notes and Account Moderation Notes (#30288)

2024-05-15 13:38:36 +00:00

report.rb

Add optional OAuth application to reports (#30539)

2024-07-16 13:23:08 +00:00

rule.rb

Extract constants for column size length validation limits (#30045)

2024-04-24 08:56:28 +00:00

scheduled_status.rb

Fix deleting a scheduled status immediately deleting media attachments (#9728)

2019-01-06 16:38:40 +01:00

search.rb

…

session_activation.rb

Add BrowserDetection model concern (#29513)

2024-03-19 15:39:14 +00:00

setting.rb

Clean up Setting model and remove dead code (#28661)

2024-01-09 14:01:53 +00:00

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

Update enum syntax to use the new Rails 7.0 style (#29217)

2024-02-16 14:54:23 +00:00

status_edit.rb

Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream

2024-07-08 19:41:14 +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

Add RankedTrend concern for trends classes (#29388)

2024-02-26 13:45:39 +00:00

status.rb

Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream

2024-07-08 19:41:14 +02:00

system_key.rb

Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681)

2023-02-18 04:30:23 +01:00

tag_feed.rb

Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream

2024-05-01 18:42:26 +02:00

tag_follow.rb

Add ability to follow hashtags (#18809)

2022-07-17 13:49:29 +02:00

tag.rb

Implement UI for Admin Search of Hashtags (#30880)

2024-07-29 15:49:44 +00:00

tombstone.rb

Record deleted(by mod) status to prevent re-appear (#10732)

2019-05-09 22:03:02 +02:00

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_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

user.rb

Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream

2024-08-14 21:17:43 +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

Use normalizes to prepare Webhook#events value (#27605)

2023-11-13 22:47:44 +00:00