tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-03 13:33:32 -05:00

History

Claire 0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.

2024-12-25 18:01:37 +01:00

account

Change Account::Field parsing to use HTML5::DocumentFragment (#31813 )

2024-09-08 18:56:18 +00:00

account_suggestions

Fix in memoriam accounts appearing in follow recommendations (#31474 )

2024-08-19 15:55:42 +00:00

admin

Add missing NOT NULL requirement to small, indexed, valid data tables (#33284 )

2024-12-14 00:16:03 +00:00

annual_report

Fix performance of percentile calculation for annual reports (#32765 )

2024-11-04 10:11:06 +00:00

concerns

Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

2024-12-25 18:01:37 +01:00

form

Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream

2024-10-14 19:46:52 +02:00

terms_of_service

Add terms of service (#33055 )

2024-12-09 10:04:46 +00:00

trends

Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

2024-12-25 18:01:37 +01:00

user_settings

Fix Lint/SymbolConversion cop (#28175 )

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

web

Add endpoint to remove web push subscription (#32626 )

2024-10-23 08:02:31 +00:00

account_alias.rb

Add missing NOT NULL requirement to small, indexed, valid data tables (#33284 )

2024-12-14 00:16:03 +00:00

account_conversation.rb

Add NOT NULL requirement to columns on account_conversations (#33308 )

2024-12-16 08:20:08 +00:00

account_deletion_request.rb

Add missing NOT NULL requirement to small, indexed, valid data tables (#33284 )

2024-12-14 00:16:03 +00:00

account_domain_block.rb

Add missing NOT NULL requirement to small, indexed, valid data tables (#33284 )

2024-12-14 00:16:03 +00:00

account_filter.rb

Use hash arguments to group when possible (#32916 )

2024-11-19 10:36:02 +00:00

account_migration.rb

Add OpenSSL::SSL::SSLError to http connection errors wrapper (#32307 )

2024-10-08 14:59:51 +00:00

account_moderation_note.rb

Fix sort order of moderation notes on Reports and Accounts (#31528 )

2024-09-06 14:58:36 +00:00

account_note.rb

Add missing NOT NULL on more columns from "large but valid" tables (#33330 )

2024-12-17 13:38:18 +00:00

account_pin.rb

Add NOT NULL requirement to account columns on AccountPin (#33244 )

2024-12-10 15:50:49 +00: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

Add Status.not_direct_visibility scope (#32065 )

2024-11-07 10:32:33 +00: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

…

account_warning.rb

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

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

account.rb

Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream

2024-11-15 18:44:32 +01:00

admin.rb

…

announcement_filter.rb

…

announcement_mute.rb

Add missing NOT NULL requirement to small, indexed, valid data tables (#33284 )

2024-12-14 00:16:03 +00:00

announcement_reaction.rb

Add missing NOT NULL requirement to small, indexed, valid data tables (#33284 )

2024-12-14 00:16:03 +00: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

Rails 7+: primary_abstract_class recommendation (#32909 )

2024-11-15 15:37:30 +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

Add age/expiry duration constants to BulkImport class (#32839 )

2024-11-12 08:57:06 +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

…

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 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream

2024-09-16 21:08:58 +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

Add missing NOT NULL requirement to small, indexed, valid data tables (#33284 )

2024-12-14 00:16:03 +00: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

Reinforce coverage for DomainBlock model (#32473 )

2024-10-14 12:51:01 +00:00

email_domain_block.rb

Add EmailDomainBlock.parents scope (#31968 )

2024-11-07 13:46:20 +00:00

export.rb

Extract ExportSummary class for account object counts (#32227 )

2024-10-03 13:09:58 +00:00

extended_description.rb

…

favourite.rb

Autofix Rubocop remaining Layout rules (#23679 )

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

featured_tag.rb

Fix error decrementing status count when FeaturedTags#last_status_at is nil (#33320 )

2024-12-16 12:33:55 +00:00

feed.rb

Remove caching in cache_collection (#29862 )

2024-04-08 13:46:13 +00:00

follow_recommendation_filter.rb

Fix follow recommendation moderation page default language when using regional variant (#32580 )

2024-10-18 10:21:25 +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

Fix follow recommendation suppressions not applying immediately (#32392 )

2024-10-14 08:18:25 +00:00

follow_request.rb

Change lists to reflect added and removed users retroactively (#32930 )

2024-11-19 10:04:12 +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

…

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

Use hash arguments to order when possible (Rails 7.2) (#32915 )

2024-11-18 15:07:53 +00:00

instance.rb

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

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

invite_filter.rb

…

invite.rb

Fix Rails/WhereRange cop (#30343 )

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

ip_block.rb

Add InetContainer with scopes of containing and contained (#32802 )

2024-11-08 10:08:36 +00:00

link_feed.rb

Fix that blocking was not working on link timeline (#32625 )

2024-10-22 12:46:32 +00:00

list_account.rb

Fix list error messages (#33082 )

2024-11-28 10:13:06 +00:00

list_feed.rb

…

list.rb

Fix list creation limit check (#32869 )

2024-11-13 10:22:11 +00:00

login_activity.rb

Add BrowserDetection model concern (#29513 )

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

marker.rb

Add missing NOT NULL on more columns from "large but valid" tables (#33330 )

2024-12-17 13:38:18 +00:00

media_attachment.rb

Revert "Support animated PNGs in media attachments (#28516 )" (#33334 )

2024-12-17 10:52:59 +00:00

mention.rb

Standardize uniqueness validation declaration on Mention (#33247 )

2024-12-10 15:45:13 +00:00

mute.rb

Change algorithm of follow recommendations (#28314 )

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

notification_group.rb

Add year in review feature to web UI (#32709 )

2024-11-05 14:40:07 +00:00

notification_permission.rb

Add notification policies and notification requests (#29366 )

2024-03-07 14:53:37 +00:00

notification_policy.rb

Fix notification requests from suspended accounts still being listed (#32354 )

2024-10-09 17:29:02 +00:00

notification_request.rb

Fix notification requests from suspended accounts still being listed (#32354 )

2024-10-09 17:29:02 +00:00

notification.rb

Extract Notification::Groups concern (#32968 )

2024-11-19 10:02:01 +00:00

poll_vote.rb

Add missing NOT NULL on more columns from "large but valid" tables (#33330 )

2024-12-17 13:38:18 +00:00

poll.rb

Remove un-needed Poll.attached scope (#33368 )

2024-12-20 15:15:11 +00:00

preview_card_provider.rb

Add reviewed and unreviewed scopes to Reviewable model concern (#31988 )

2024-09-20 08:51:37 +00:00

preview_card_trend.rb

Add not_allowed scope for PreviewCardTrend (#29599 )

2024-03-26 13:21:20 +00:00

preview_card.rb

Fix empty authors preview card serialization (#33151 )

2024-12-04 09:05:58 +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

Always validate inbox_url presence on Relay (#32364 )

2024-12-02 07:38:06 +00:00

remote_follow.rb

Extract wrapper constant for HTTP::* error classes (#32285 )

2024-10-08 13:53:35 +00:00

report_filter.rb

Add relevant_params to ReportFilter (matches account filter) (#32136 )

2024-10-02 13:24:40 +00:00

report_note.rb

Fix sort order of moderation notes on Reports and Accounts (#31528 )

2024-09-06 14:58: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

Add missing NOT NULL requirement to small, indexed, valid data tables (#33284 )

2024-12-14 00:16:03 +00:00

search.rb

…

session_activation.rb

Use existing arel scopes instead of string ordering (#32801 )

2024-11-08 14:21:44 +00:00

setting.rb

Remove thing_type and thing_id columns from settings table (#31971 )

2024-12-05 14:34:14 +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

Add coverage for malformed version cleanup in SoftwareUpdateCheckService, add helper query methods (#32876 )

2024-11-14 14:03:57 +00:00

status_edit.rb

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

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

status_pin.rb

Enhance coverage for StatusPin model (#32515 )

2024-10-28 07:34:58 +00:00

status_stat.rb

Use likes and shares totalItems on status creations and updates (#32620 )

2024-10-28 04:55:18 +00:00

status_trend.rb

Add RankedTrend concern for trends classes (#29388 )

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

status.rb

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

2024-11-24 16:46:28 +01:00

tag_feed.rb

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

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

tag_follow.rb

Fix pushing hashtag-followed posts to feeds of inactive users (#33018 )

2024-11-22 08:30:57 +00:00

tag_trend.rb

Update schema/annotations after tag trend db/redis migrate (#33173 )

2024-12-04 17:55:56 +00:00

tag.rb

Change hashtag trends to be stored in the database instead of redis (#32837 )

2024-12-04 11:59:17 +00:00

terms_of_service.rb

Add terms of service (#33055 )

2024-12-09 10:04:46 +00:00

tombstone.rb

Add missing NOT NULL on more columns from "large but valid" tables (#33330 )

2024-12-17 13:38:18 +00: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

Add missing NOT NULL requirement to small, indexed, valid data tables (#33284 )

2024-12-14 00:16:03 +00:00

user_ip.rb

Add InetContainer with scopes of containing and contained (#32802 )

2024-11-08 10:08:36 +00:00

user_role.rb

Update user role position range limit (#33349 )

2024-12-19 08:10:39 +00:00

user_settings.rb

Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

2024-12-25 18:01:37 +01:00

user.rb

Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

2024-12-25 18:01:37 +01: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

Add coverage for Webhook validations (#33026 )

2024-11-25 08:19:16 +00:00