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 734e186717 Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/load_locale.js`: The file moved to `app/javascript/mastodon/locales/load_locale.ts`. Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`. - `app/javascript/mastodon/locales/index.js`: The file moved to `app/javascript/mastodon/locales/index.ts`. Did *not* port the changes as I want to try something a bit different.		1 year ago
..
admin	Fix RSpec/InferredSpecType cop (#24736)	2 years ago
accounts_helper_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2 years ago
application_helper_spec.rb	Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream	1 year ago
flashes_helper_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2 years ago
formatting_helper_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2 years ago
home_helper_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2 years ago
instance_helper_spec.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	7 years ago
jsonld_helper_spec.rb	Fix RSpec/ContextWording cop (#24739)	2 years ago
languages_helper_spec.rb	Helpers specs coverage improvement (#23937)	2 years ago
media_component_helper_spec.rb	React component helper specs (#24072)	2 years ago
react_component_helper_spec.rb	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	1 year ago
routing_helper_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2 years ago
settings_helper_spec.rb	Helpers specs coverage improvement (#23937)	2 years ago
statuses_helper_spec.rb	Coverage improvement round-out following up previous work (#23987)	2 years ago