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 7066e3d5ce Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' 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.		1 year ago
..
account_counters_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2 years ago
account_finder_concern_spec.rb	Handle nil and blank cases in Account finders (#3500)	8 years ago
account_interactions_spec.rb	Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream	1 year ago
remotable_spec.rb	Fix RSpec/ContextWording cop (#24739)	2 years ago
status_threading_concern_spec.rb	Update rubocop-rspec to version 2.22.0, fix `RSpec/IndexedLet` cop (#24698)	1 year ago