Claire 1f796d129d Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream ... Conflicts: - `config/routes/api.rb`: Upstream added an endpoint, textually close to a glitch-soc-only endpoint. Ported upstream changes.		2024-07-30 20:47:34 +02:00
..
chewy	Clamp dates when serializing to Elasticsearch API (#28081)	2023-11-27 13:25:54 +00:00
controllers	Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream	2024-07-30 20:47:34 +02:00
helpers	Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream	2024-07-29 19:16:58 +02:00
javascript	Merge commit '598ae4f2da86029b1c3c3e35e64b89873037b598' into glitch-soc/merge-upstream	2024-07-30 20:47:34 +02:00
lib	Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream	2024-07-29 19:16:58 +02:00
mailers	Remove duplicate method def ApplicationHelper#instance_presenter (#30331)	2024-05-17 08:29:13 +00:00
models	Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream	2024-07-29 19:16:58 +02:00
policies	Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream	2024-05-20 12:17:36 +02:00
presenters	Enable OAuth PKCE Extension (#31129)	2024-07-26 08:53:10 +00:00
serializers	Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream	2024-07-27 13:19:38 +02:00
services	Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream	2024-07-23 19:31:23 +02:00
validators	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
views	Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream	2024-07-29 19:16:58 +02:00
workers	Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream	2024-07-25 17:47:02 +02:00