Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.		2023-02-19 10:42:55 +01:00
..
activitypub	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
account_search_service_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
account_statuses_cleanup_service_spec.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
after_block_domain_from_account_service_spec.rb	…
after_block_service_spec.rb	…
app_sign_up_service_spec.rb	…
authorize_follow_service_spec.rb	…
batched_remove_status_service_spec.rb	…
block_domain_service_spec.rb	…
block_service_spec.rb	…
bootstrap_timeline_service_spec.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
clear_domain_media_service_spec.rb	…
delete_account_service_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
fan_out_on_write_service_spec.rb	…
favourite_service_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
fetch_link_card_service_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
fetch_oembed_service_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
fetch_remote_status_service_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
fetch_resource_service_spec.rb	Autofix Rubocop RSpec/EmptyLineAfterFinalLet (#23707)	2023-02-19 07:10:19 +09:00
follow_service_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
import_service_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
mute_service_spec.rb	…
notify_service_spec.rb	…
post_status_service_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
precompute_feed_service_spec.rb	Autofix Rubocop RSpec/EmptyLineAfterFinalLet (#23707)	2023-02-19 07:10:19 +09:00
process_mentions_service_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
purge_domain_service_spec.rb	…
reblog_service_spec.rb	…
reject_follow_service_spec.rb	…
remove_from_follwers_service_spec.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
remove_status_service_spec.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
report_service_spec.rb	…
resolve_account_service_spec.rb	Autofix Rubocop Style/StringLiterals (#23695)	2023-02-19 07:38:14 +09:00
resolve_url_service_spec.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
search_service_spec.rb	Autofix Rubocop RSpec/EmptyLineAfterExample (#23661)	2023-02-17 21:46:00 +09:00
suspend_account_service_spec.rb	Fix possible race conditions when suspending/unsuspending accounts (#22363)	2023-01-05 13:47:21 +01:00
unallow_domain_service_spec.rb	…
unblock_domain_service_spec.rb	…
unblock_service_spec.rb	…
unfollow_service_spec.rb	…
unmute_service_spec.rb	…
unsuspend_account_service_spec.rb	Fix possible race conditions when suspending/unsuspending accounts (#22363)	2023-01-05 13:47:21 +01:00
update_account_service_spec.rb	…
update_status_service_spec.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
verify_link_service_spec.rb	Suppress AddressFamilyError in link verification (#23204)	2023-01-23 13:05:54 +01:00