Claire 60298af3c4 Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Upstream changed how the `inert.css` file is included. The conflict is caused by glitch-soc's theming system. Ported the upstream change. Additional changes: - `config/webpack/shared.js`: bypass glitch-soc's theming system for `inert` pack.		2024-01-15 20:01:36 +01:00
..
admin.jsx	Update rails/ujs delegate method usage (#27538)	2023-10-24 20:38:19 +00:00
application.js	Change eslint config to autofix missing comma and indentation in JS files (#26711)	2023-10-09 13:38:29 +02:00
common.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	2020-10-21 21:28:47 +02:00
error.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	2020-10-13 01:19:35 +02:00
inert.js	Use the assets pipeline to load inert.css (#28701)	2024-01-12 09:32:45 +00:00
public-path.js	Move ESLint configs to overrides (#24370)	2023-04-03 12:41:10 +02:00
public.jsx	Fix @rails/ujs import on public.jsx (#2482)	2023-11-24 17:40:31 +01:00
share.jsx	Fix /share and cleanup and reorganize frontend locale loading (#25240)	2023-06-02 15:00:27 +02:00
sign_up.js	Add client-side timeout on resend confirmation button (#26300)	2023-08-03 01:51:10 +02:00