Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them.

2023-02-25 14:00:40 +01:00

..

account

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

admin

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

concerns

Merge branch 'main' into glitch-soc/merge-upstream

2023-02-25 14:00:40 +01:00

trends

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

web

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

account_alias_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

account_conversation_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

account_deletion_request_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

account_domain_block_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

account_filter_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

account_migration_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

account_moderation_note_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

account_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

account_statuses_cleanup_policy_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

account_statuses_filter_spec.rb

Autofix Rubocop RSpec/LeadingSubject (#23670)

2023-02-20 13:24:14 +09:00

announcement_mute_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

announcement_reaction_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

announcement_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

appeal_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

backup_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

block_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

canonical_email_block_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

conversation_mute_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

conversation_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

custom_emoji_category_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

custom_emoji_filter_spec.rb

Autofix Rubocop RSpec/LeadingSubject (#23670)

2023-02-20 13:24:14 +09:00

custom_emoji_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

custom_filter_keyword_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

custom_filter_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

device_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

domain_allow_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

domain_block_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

email_domain_block_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

encrypted_message_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

export_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

favourite_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

featured_tag_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

follow_recommendation_suppression_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

follow_request_spec.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-02-25 14:00:40 +01:00

follow_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

home_feed_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

identity_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

import_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

invite_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

ip_block_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

list_account_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

list_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

login_activity_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

marker_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

media_attachment_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

mention_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

mute_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

notification_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

one_time_key_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

poll_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

poll_vote_spec.rb

Implement pending tests (#11415)

2019-07-27 10:24:26 +02:00

preview_card_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

preview_card_trend_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

public_feed_spec.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-02-25 14:00:40 +01:00

relationship_filter_spec.rb

Fix followings list order | Issue #13538 (#13676)

2020-05-08 20:17:16 +02:00

relay_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

remote_follow_spec.rb

Autofix Rubocop RSpec/LeadingSubject (#23670)

2023-02-20 13:24:14 +09:00

report_filter_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

report_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

rule_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

scheduled_status_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

session_activation_spec.rb

Autofix Rubocop RSpec/ImplicitSubject (#23721)

2023-02-20 05:00:48 +01:00

setting_spec.rb

Autofix Rubocop RSpec/LeadingSubject (#23670)

2023-02-20 13:24:14 +09:00

site_upload_spec.rb

Add a test for SiteUpload#cache_key (#5685)

2017-11-14 20:44:11 +01:00

status_edit_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

status_pin_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

status_spec.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-02-25 14:00:40 +01:00

status_stat_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

status_trend_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

system_key_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

tag_feed_spec.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-02-25 14:00:40 +01:00

tag_follow_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

tag_spec.rb

Autofix Rubocop remaining Layout rules (#23679)

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

unavailable_domain_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

user_invite_request_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

user_role_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

user_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

webauthn_credentials_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00

webhook_spec.rb

Enable Style/FrozenStringLiteralComment for specs (#23790)

2023-02-22 09:55:31 +09:00