Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.		2023-12-20 22:16:50 +01:00
..
account	…
admin	Consolidate configuration of `Sidekiq::Testing.fake!` setup (#28046)	2023-11-23 09:43:43 +00:00
concerns	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
form	Remove 2x double subject call in `models/form/account_batch` spec (#28209)	2023-12-04 15:41:43 +00:00
trends	…
user_settings	…
web	…
account_conversation_spec.rb	…
account_domain_block_spec.rb	…
account_filter_spec.rb	…
account_migration_spec.rb	…
account_spec.rb	Model concerns organization into module namespaces (#28149)	2023-12-01 11:00:41 +00:00
account_statuses_cleanup_policy_spec.rb	Reduce `.times` usage in `AccountStatusesCleanupPolicy` (#27947)	2023-11-20 09:08:54 +00:00
account_warning_preset_spec.rb	…
appeal_spec.rb	…
block_spec.rb	…
canonical_email_block_spec.rb	…
conversation_spec.rb	…
custom_emoji_category_spec.rb	…
custom_emoji_filter_spec.rb	…
custom_emoji_spec.rb	…
domain_allow_spec.rb	…
domain_block_spec.rb	…
email_domain_block_spec.rb	…
export_spec.rb	…
extended_description_spec.rb	…
favourite_spec.rb	…
follow_request_spec.rb	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01:00
follow_spec.rb	…
home_feed_spec.rb	…
identity_spec.rb	…
import_spec.rb	…
invite_spec.rb	…
ip_block_spec.rb	…
marker_spec.rb	…
media_attachment_spec.rb	…
mention_spec.rb	…
notification_spec.rb	…
one_time_key_spec.rb	…
poll_spec.rb	…
poll_vote_spec.rb	…
preview_card_provider_spec.rb	…
preview_card_spec.rb	…
privacy_policy_spec.rb	…
public_feed_spec.rb	Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream	2023-12-18 18:34:25 +01:00
relationship_filter_spec.rb	…
remote_follow_spec.rb	…
report_filter_spec.rb	…
report_spec.rb	Remove `default_scope` from `Admin::ActionLog` (#28026)	2023-11-29 10:39:59 +00:00
rule_spec.rb	…
session_activation_spec.rb	Fix `RSpec/MessageChain` cop (#27776)	2023-11-09 12:57:23 +00:00
setting_spec.rb	Fix `RSpec/AnyInstance` cop (#27810)	2023-11-14 14:52:59 +00:00
site_upload_spec.rb	…
software_update_spec.rb	…
status_edit_spec.rb	…
status_pin_spec.rb	Reduce `.times` usage in `StatusPin` and add `PIN_LIMIT` constant in validator (#27945)	2023-11-20 09:07:25 +00:00
status_spec.rb	…
tag_feed_spec.rb	…
tag_spec.rb	…
user_role_spec.rb	…
user_settings_spec.rb	…
user_spec.rb	Fix unsupported time zone or locale preventing sign-up (#28035)	2023-11-22 11:38:07 +00:00
webauthn_credentials_spec.rb	…
webhook_spec.rb	Use `normalizes` to prepare `Webhook#events` value (#27605)	2023-11-13 22:47:44 +00:00