You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 498de92bc8 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.		2 years ago
..
account	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
admin	Coverage improvement round-out following up previous work (#23987)	2 years ago
concerns	Fix most rubocop issues (#2165)	2 years ago
form	Coverage improvement round-out following up previous work (#23987)	2 years ago
trends	Pending example models minimal coverage (#23912)	2 years ago
user_settings	Wrong type for user setting when default is defined by lambda (#24321)	2 years ago
web	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
account_alias_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
account_conversation_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
account_deletion_request_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
account_domain_block_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
account_filter_spec.rb	Autofix Rubocop RSpec/MatchArray (#24675)	2 years ago
account_migration_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
account_moderation_note_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
account_spec.rb	Autofix Rubocop RSpec/MatchArray (#24050)	2 years ago
account_statuses_cleanup_policy_spec.rb	Autofix Rubocop RSpec/MatchArray (#24050)	2 years ago
account_statuses_filter_spec.rb	Autofix Rubocop RSpec/LeadingSubject (#23670)	2 years ago
account_warning_preset_spec.rb	Models specs coverage (#23940)	2 years ago
announcement_mute_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
announcement_reaction_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
announcement_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
appeal_spec.rb	Pending example models minimal coverage (#23912)	2 years ago
backup_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
block_spec.rb	Fabricator specs (#23925)	2 years ago
canonical_email_block_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
conversation_mute_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
conversation_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
custom_emoji_category_spec.rb	Pending example models minimal coverage (#23912)	2 years ago
custom_emoji_filter_spec.rb	Autofix Rubocop RSpec/MatchArray (#24050)	2 years ago
custom_emoji_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
custom_filter_keyword_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
custom_filter_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
device_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
domain_allow_spec.rb	Pending example models minimal coverage (#23912)	2 years ago
domain_block_spec.rb	Fabricator specs (#23925)	2 years ago
email_domain_block_spec.rb	Fabricator specs (#23925)	2 years ago
encrypted_message_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
export_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
extended_description_spec.rb	Models specs coverage (#23940)	2 years ago
favourite_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
featured_tag_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
follow_recommendation_suppression_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
follow_request_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
follow_spec.rb	Fabricator specs (#23925)	2 years ago
home_feed_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
identity_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
import_spec.rb	Misc coverage improvements for validators (#23928)	2 years ago
invite_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
ip_block_spec.rb	Pending example models minimal coverage (#23912)	2 years ago
list_account_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
list_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
login_activity_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
marker_spec.rb	Pending example models minimal coverage (#23912)	2 years ago
media_attachment_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
mention_spec.rb	Fabricator specs (#23925)	2 years ago
mute_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
notification_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
one_time_key_spec.rb	Misc coverage improvements for validators (#23928)	2 years ago
poll_spec.rb	Pending example models minimal coverage (#23912)	2 years ago
poll_vote_spec.rb	Fix single-record invalid condition on PollVote (#23810)	2 years ago
preview_card_provider_spec.rb	Models specs coverage (#23940)	2 years ago
preview_card_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
preview_card_trend_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
privacy_policy_spec.rb	Models specs coverage (#23940)	2 years ago
public_feed_spec.rb	Fix most rubocop issues (#2165)	2 years ago
relationship_filter_spec.rb	Fix followings list order | Issue #13538 (#13676)	5 years ago
relay_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
remote_follow_spec.rb	Autofix Rubocop RSpec/LeadingSubject (#23670)	2 years ago
report_filter_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
report_spec.rb	Fabricator specs (#23925)	2 years ago
rule_spec.rb	Pending example models minimal coverage (#23912)	2 years ago
scheduled_status_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
session_activation_spec.rb	Autofix Rubocop RSpec/ImplicitSubject (#23721)	2 years ago
setting_spec.rb	Autofix Rubocop RSpec/LeadingSubject (#23670)	2 years ago
site_upload_spec.rb	Add a test for SiteUpload#cache_key (#5685)	7 years ago
status_edit_spec.rb	Pending example models minimal coverage (#23912)	2 years ago
status_pin_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
status_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
status_stat_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
status_trend_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
system_key_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
tag_feed_spec.rb	Fix most rubocop issues (#2165)	2 years ago
tag_follow_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
tag_spec.rb	Autofix Rubocop remaining Layout rules (#23679)	2 years ago
unavailable_domain_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
user_invite_request_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
user_role_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
user_settings_spec.rb	Change user settings to be stored in a more optimal way (#23630)	2 years ago
user_spec.rb	Autofix Rubocop RSpec/MatchArray (#24050)	2 years ago
webauthn_credentials_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
webhook_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago