tootlab-mastodon

mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-16 04:32:57 -05:00

History

Claire 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream

Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.

2023-06-25 14:27:38 +02: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 ArgumentError in /api/v1/admin/accounts/:id/action (#25386 )

2023-06-14 15:21:36 +02:00

concerns

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

2023-05-08 19:28:21 +02:00

form

Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream

2023-06-10 15:17:08 +02:00

trends

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

2023-05-08 19:28:21 +02:00

user_settings

Wrong type for user setting when default is defined by lambda (#24321 )

2023-03-31 07:33:17 +02:00

web

Autofix Rubocop remaining Layout rules (#23679 )

2023-02-20 06:58:28 +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 /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

Rename with_lock to with_redis_lock to avoid confusion with ActiveRecord's method (#24741 )

2023-05-02 18:16:07 +02: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_statuses_filter.rb

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

2023-05-08 19:28:21 +02:00

account_suggestions.rb

…

account_summary.rb

Autofix Rubocop remaining Layout rules (#23679 )

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

account_warning_preset.rb

…

account_warning.rb

Autofix Rubocop remaining Layout rules (#23679 )

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

account.rb

Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream

2023-06-10 18:42:29 +02:00

admin.rb

…

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

announcement.rb

Autofix Rubocop Rails/WhereEquals (#23759 )

2023-02-21 03:20:56 +09:00

appeal.rb

Fix Rails/InverseOf cop (#24732 )

2023-04-30 14:06:53 +02:00

application_record.rb

…

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

Rewrite import feature (#21054 )

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

bulk_import.rb

Add support for importing lists (#25203 )

2023-06-01 14:47:31 +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_mute.rb

Autofix Rubocop remaining Layout rules (#23679 )

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

conversation.rb

Autofix Rubocop remaining Layout rules (#23679 )

2023-02-20 06:58:28 +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_emoji.rb

Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream

2023-05-08 15:28:36 +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

custom_filter.rb

Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761 )

2023-03-31 15:07:22 +02: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

Autofix Rubocop Regex Style rules (#23690 )

2023-06-06 14:50:51 +02:00

email_domain_block.rb

Autofix Rubocop Rails/IgnoredColumnsAssignment (#23761 )

2023-03-31 15:07:22 +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

Autofix Rubocop remaining Layout rules (#23679 )

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

feed.rb

…

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

Fix Rails/InverseOf cop (#24732 )

2023-04-30 14:06:53 +02: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

follow.rb

Autofix Rubocop remaining Layout rules (#23679 )

2023-02-20 06:58:28 +01: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_filter.rb

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

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

instance.rb

Fix inconsistent naming of Instance.by_domain_and_subdomain (#25159 )

2023-05-31 09:57:24 +02: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

Autofix Rubocop remaining Layout rules (#23679 )

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

ip_block.rb

Autofix Rubocop remaining Layout rules (#23679 )

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

list_account.rb

Fix various edge cases with local moves (#24812 )

2023-05-03 19:19:25 +02:00

list_feed.rb

…

list.rb

Add exclusive lists (#22048 )

2023-06-05 09:37:02 +02: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 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream

2023-05-08 19:28:21 +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

Fix Performance/MapCompact cop (#24797 )

2023-05-23 10:49:12 +02: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/CompactBlank cop (#24690 )

2023-04-30 14:07:21 +02:00

preview_card_provider.rb

Add trend management to admin API (#24257 )

2023-04-18 11:33:30 +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

preview_card.rb

Change media upload limits and remove client-side resizing (#23726 )

2023-03-25 10:00:03 +01: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 Performance/CollectionLiteralInLoop cop (#24819 )

2023-05-04 05:33:55 +02:00

relay.rb

Autofix Rubocop remaining Layout rules (#23679 )

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

remote_follow.rb

Autofix Rubocop Style/RedundantBegin (#23703 )

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

Autofix Rubocop remaining Layout rules (#23679 )

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

report.rb

Add missing report category translation (#25400 )

2023-06-13 15:05:40 +02: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

Autofix Rubocop Regex Style rules (#23690 )

2023-06-06 14:50:51 +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

Autofix Rubocop remaining Layout rules (#23679 )

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

status_trend.rb

2022-10-14 01:44:23 +02:00

status.rb

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

2023-05-08 19:28:21 +02:00

system_key.rb

Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681 )

2023-02-18 04:30:23 +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

tag.rb

Autofix Rubocop Regex Style rules (#23690 )

2023-06-06 14:50:51 +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 branch 'main' into glitch-soc/merge-upstream

2022-10-28 19:23:58 +02:00

unavailable_domain.rb

Autofix Rubocop remaining Layout rules (#23679 )

2023-02-20 06:58:28 +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 '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream

2023-06-25 14:27:38 +02:00

user.rb

Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream

2023-06-10 18:42: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 finer permission requirements for managing webhooks (#25463 )

2023-06-22 14:52:25 +02:00