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
..
account_counters_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
account_finder_concern_spec.rb	Handle nil and blank cases in Account finders (#3500)	2017-06-01 08:20:36 -04:00
account_interactions_spec.rb	Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream	2023-06-18 13:41:33 +02:00
remotable_spec.rb	Fix RSpec/ContextWording cop (#24739)	2023-05-04 05:49:08 +02:00
status_threading_concern_spec.rb	Update rubocop-rspec to version 2.22.0, fix RSpec/IndexedLet cop (#24698)	2023-06-14 16:44:37 +02:00