Claire 1399e9d863 Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.		2023-07-12 16:03:05 +02:00
..
chewy	Change account search to match by text when opted-in (#25599)	2023-06-29 13:05:21 +02:00
controllers	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
helpers	Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream	2023-07-12 15:44:33 +02:00
javascript	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
lib	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
mailers	Refactor NotificationMailer to use parameterization (#25718)	2023-07-10 03:06:22 +02:00
models	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
policies	Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
presenters	Fix Performance/CollectionLiteralInLoop cop (#24819)	2023-05-04 05:33:55 +02:00
serializers	Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream	2023-07-12 15:27:32 +02:00
services	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
validators	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
views	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
workers	Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream	2023-07-12 15:44:33 +02:00