Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc.		2024-01-17 18:32:15 +01:00
..
assets.rake	…
auto_annotate_models.rake	…
branding.rake	…
db.rake	Fix `Rails/RakeEnvironment` cop (#28782)	2024-01-17 16:33:17 +00:00
emojis.rake	Add new emojis from `jdecked/twemoji` 15.0 (#28404)	2024-01-11 16:15:08 +00:00
glitchsoc.rake	Fix Ruby linting issue	2024-01-15 20:57:55 +01:00
icons.rake	Add a new `@/` alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
mastodon.rake	…
repo.rake	…
spec.rake	Add JS console errors check (#28682)	2024-01-12 09:12:31 +00:00
statistics.rake	…
tests.rake	Fix ISO code for Canadian French (#26015)	2024-01-09 10:56:13 +00:00
webpacker.rake	…