Claire f09f5b35f2 Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream refactored this file a bit, moving validation limits to constants. We already had a similar change, although with different constant names. Updated to match upstream's code. The following files were also modified accordingly: - `app/views/settings/profiles/show.html.haml` - `spec/requests/api/v1/accounts/credentials_spec.rb`		2024-05-04 16:12:51 +02:00
..
about	…
accounts	…
admin	Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream	2024-05-04 16:12:51 +02:00
admin_mailer	Fix string interpolation for software updates admin mailer (#30035)	2024-04-23 12:54:52 +00:00
application	Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +02:00
auth	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
custom_css	…
disputes/strikes	…
errors	…
filters	Use `EXPIRATION_DURATIONS` constant in `CustomFilter` class (#30088)	2024-04-29 09:01:46 +00:00
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream	2024-05-01 18:38:55 +02:00
mail_subscriptions	…
media	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
notification_mailer	…
oauth	…
privacy	…
redirects	…
relationships	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
remote_interaction_helper	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
settings	Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream	2024-05-04 16:12:51 +02:00
severed_relationships	Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately (#29714)	2024-03-22 15:44:31 +00:00
shared	Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
shares	Replace `use_pack`, `layouts/theme` and `@theme` by new helpers	2024-04-28 15:45:42 +02:00
statuses	…
statuses_cleanup	…
tags	…
user_mailer	Use partial collection render for welcome mailer features (#29843)	2024-04-04 16:13:10 +00:00
well_known/host_meta	…
.rubocop.yml	…