Claire 6c99479ef4 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream ... Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.		2023-06-18 13:41:33 +02:00
..
activitypub	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	2023-06-10 16:48:01 +02:00
admin	Update Admin::Metrics::Measure classes for Rails 7 (#25236)	2023-06-05 20:46:04 +02:00
connection_pool	Fix Lint/ConstantDefinitionInBlock cop (#24763)	2023-05-03 10:32:30 +02:00
importer	Add specs for Chewy importers (#24204)	2023-03-22 14:06:26 +01:00
mastodon	Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop (#24698)	2023-06-14 16:44:37 +02:00
ostatus	Fix RSpec/DescribedClass cop (#25104)	2023-06-06 13:58:33 +02:00
translation_service	Translate CW, poll options and media descriptions (#24175)	2023-06-01 00:10:21 +02:00
vacuum	Change AccessTokensVacuum to also delete expired tokens (#24868)	2023-05-11 04:40:03 +02:00
webhooks	Add webhook templating (#23289)	2023-06-06 10:42:47 +02:00
account_reach_finder_spec.rb	Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop (#24698)	2023-06-14 16:44:37 +02:00
advanced_text_formatter_spec.rb	Fix rubocop issues in glitch-soc-specific code	2023-05-08 19:28:43 +02:00
delivery_failure_tracker_spec.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
emoji_formatter_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
entity_cache_spec.rb	Fix RSpec/DescribedClass cop (#25104)	2023-06-06 13:58:33 +02:00
extractor_spec.rb	Fix RSpec/DescribedClass cop (#25104)	2023-06-06 13:58:33 +02:00
fast_ip_map_spec.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
feed_manager_spec.rb	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
hashtag_normalizer_spec.rb	Change how hashtags are normalized (#18795)	2022-07-13 15:03:28 +02:00
html_aware_formatter_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
link_details_extractor_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
permalink_redirector_spec.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
plain_text_formatter_spec.rb	Unescape HTML entities (#24019)	2023-03-08 19:56:41 +01:00
request_pool_spec.rb	Fix Performance/TimesMap cop (#24789)	2023-05-02 18:07:16 +02:00
request_spec.rb	Fix RSpec/DescribedClass cop (#25104)	2023-06-06 13:58:33 +02:00
sanitize_config_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-12 10:15:46 +01:00
scope_transformer_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
search_query_transformer_spec.rb	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
status_cache_hydrator_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
status_filter_spec.rb	Fix RSpec/ExpectInHook cop (#25100)	2023-05-23 16:40:21 +02:00
status_finder_spec.rb	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
status_reach_finder_spec.rb	Fix RSpec/MissingExampleGroupArgument cop (#25310)	2023-06-06 15:51:42 +02:00
suspicious_sign_in_detector_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
tag_manager_spec.rb	Fix RSpec/DescribedClass cop (#25104)	2023-06-06 13:58:33 +02:00
text_formatter_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
webfinger_resource_spec.rb	Fix RSpec/DescribedClass cop (#25104)	2023-06-06 13:58:33 +02:00