Claire 360590ecd8 Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/accounts_controller.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. - `app/lib/account_statuses_filter.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes.		2024-05-01 19:30:41 +02:00
..
chewy	…
config/initializers/rack	…
controllers	Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +02:00
fabrication	…
fabricators	Use fabrication sequence in domain values (#29895)	2024-04-11 08:59:01 +00:00
features	Move OAuth flow tests from feature tests to system tests (#29837)	2024-04-05 16:52:05 +00:00
fixtures	…
generators	…
helpers	Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream	2024-05-01 18:38:55 +02:00
lib	Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream	2024-05-01 18:56:48 +02:00
locales	…
mailers	Add stub for trending tags in user mailer spec (#29850)	2024-04-05 07:48:07 +00:00
models	Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream	2024-05-01 19:30:41 +02:00
policies	…
presenters	…
requests	Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream	2024-05-01 18:56:48 +02:00
routing	…
search/models/concerns/account	Use enum-generated `public_visibility` scope on Status (#28156)	2024-03-14 09:31:57 +00:00
serializers	Add `max_pinned_statuses` to instances serializer and api response (#29441)	2024-04-02 13:54:11 +00:00
services	Combine double subject runs and DRY up change check in bulk import service spec (#29402)	2024-04-17 08:23:25 +00:00
support	Update dependency selenium-webdriver to v4.19.0 (#29776)	2024-04-02 08:53:44 +00:00
system	Move OAuth flow tests from feature tests to system tests (#29837)	2024-04-05 16:52:05 +00:00
validators	Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream	2024-03-13 20:14:18 +01:00
views	Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
workers	…
rails_helper.rb	…
spec_helper.rb	…