Claire 6f342a6d4c Merge commit '34e826f373' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/theme_helper.rb`: Conflict caused by our different theme systems. Ported upstream's changes. - `app/models/account.rb`: Upstream basically made a change we already made. Moved constant declaration to match upstream.		2024-05-01 18:56:48 +02:00
..
chewy
config/initializers/rack	Use unchanging github links in docs/comments (#29545)	2024-03-11 15:14:55 +00:00
controllers	Merge commit '20b1e55f24' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +02:00
fabrication	Ensure unique values in fabricators (#29515)	2024-03-11 08:53:24 +00:00
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	Add end-to-end test for OCR in media uploads (#29148)	2024-02-08 19:13:44 +00:00
generators	Fix flaky tests related to file creation (#28248)	2023-12-06 22:22:25 +00:00
helpers	Merge commit 'b61ae28f8d' into glitch-soc/merge-upstream	2024-05-01 18:38:55 +02:00
lib	Merge commit '34e826f373' 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 '20b1e55f24' into glitch-soc/merge-upstream	2024-05-01 18:42:26 +02:00
policies	Merge commit '98b5f85f10' into glitch-soc/merge-upstream	2024-01-15 20:53:16 +01:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
requests	Merge commit '34e826f373' 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	Undo notification permissions on individual and domain blocks (#29570)	2024-03-26 14:46:38 +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 'a32a126cac' into glitch-soc/merge-upstream	2024-03-13 20:14:18 +01:00
views	Merge commit '34e826f373' into glitch-soc/merge-upstream	2024-05-01 18:56:48 +02:00
workers	Merge commit '08342ad40c' into glitch-soc/merge-upstream	2024-02-24 15:02:28 +01:00
rails_helper.rb	Use before_all block to setup requests/cache_spec data (#29437)	2024-03-13 08:38:57 +00:00
spec_helper.rb	Change registrations to be disabled by default for new servers (#29280)	2024-02-22 13:28:19 +00:00