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.

2023-06-10 15:32:29 +02:00

..

admin

Add hCaptcha support (#25019)

2023-05-16 23:27:35 +02:00

accounts_helper.rb

Fix most rubocop issues (#2165)

2023-04-09 11:25:30 +02:00

application_helper.rb

Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream

2023-06-10 14:38:04 +02:00

branding_helper.rb

Fix Rails/ContentTag cop (#24691)

2023-04-30 06:47:15 +02:00

context_helper.rb

Compact JSON-LD signed incoming activities (#17426)

2022-02-03 14:07:29 +01:00

domain_control_helper.rb

Autofix Rubocop Style/RedundantBegin (#23703)

2023-02-19 07:09:40 +09:00

email_helper.rb

Apply Rubocop Performance/StringReplacement (#23445)

2023-02-08 03:21:21 +01:00

flashes_helper.rb

Clean up flash display in views (#2336)

2017-04-23 04:22:34 +02:00

formatting_helper.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-02-19 10:42:55 +01:00

home_helper.rb

Fix regressions from change in account row design in web UI (#24343)

2023-04-01 09:27:23 +02:00

instance_helper.rb

Remove instance variables from helper usage (#24203)

2023-04-23 22:35:54 +02:00

jsonld_helper.rb

Remove instance variables from helper usage (#24203)

2023-04-23 22:35:54 +02:00

languages_helper.rb

Disable some metrics cops (#25215)

2023-05-31 23:33:10 +02:00

mascot_helper.rb

Use custom mascot on static share page (#15687)

2021-02-11 02:18:56 +01:00

media_component_helper.rb

React component helper specs (#24072)

2023-04-26 18:21:32 +02:00

react_component_helper.rb

Fix /share and cleanup and reorganize frontend locale loading (#25240)

2023-06-02 15:00:27 +02:00

routing_helper.rb

Fix CDN_HOST not affected on full_asset_url (#18662)

2022-06-23 23:09:32 +02:00

settings_helper.rb

Remove unused #hash_to_object method in SettingsHelper (#25213)

2023-06-01 09:47:05 +02:00

statuses_helper.rb

Fix Rails/CompactBlank cop (#24690)

2023-04-30 14:07:21 +02:00

webfinger_helper.rb

Remove dependency on goldfinger gem (#14919)

2020-10-08 00:34:57 +02:00