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 3b87fe21fa Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' 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	Add hCaptcha support (#25019)	2 years ago
accounts_helper.rb	Fix most rubocop issues (#2165)	2 years ago
application_helper.rb	Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream	1 year ago
branding_helper.rb	Fix Rails/ContentTag cop (#24691)	2 years ago
context_helper.rb	Compact JSON-LD signed incoming activities (#17426)	3 years ago
domain_control_helper.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
email_helper.rb	Apply Rubocop Performance/StringReplacement (#23445)	2 years ago
flashes_helper.rb	Clean up flash display in views (#2336)	8 years ago
formatting_helper.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
home_helper.rb	Fix regressions from change in account row design in web UI (#24343)	2 years ago
instance_helper.rb	Remove instance variables from helper usage (#24203)	2 years ago
jsonld_helper.rb	Remove instance variables from helper usage (#24203)	2 years ago
languages_helper.rb	Disable some metrics cops (#25215)	1 year ago
mascot_helper.rb	Use custom mascot on static share page (#15687)	4 years ago
media_component_helper.rb	React component helper specs (#24072)	2 years ago
react_component_helper.rb	Fix `/share` and cleanup and reorganize frontend locale loading (#25240)	1 year ago
routing_helper.rb	Fix CDN_HOST not affected on full_asset_url (#18662)	2 years ago
settings_helper.rb	Remove unused #hash_to_object method in SettingsHelper (#25213)	1 year ago
statuses_helper.rb	Fix Rails/CompactBlank cop (#24690)	2 years ago
webfinger_helper.rb	Remove dependency on goldfinger gem (#14919)	4 years ago