Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream ...

Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.

2024-05-01 19:38:34 +02:00

..

chewy

…

controllers

Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream

2024-05-01 19:38:34 +02:00

helpers

Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream

2024-05-01 19:16:48 +02:00

javascript

Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream

2024-05-01 19:38:34 +02:00

lib

Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream

2024-05-01 19:38:34 +02:00

mailers

Use existing MascotHelper#instance_presenter instead of local var in welcome email template (#29759)

2024-03-26 15:58:48 +00:00

models

Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream

2024-05-01 19:38:34 +02:00

policies

…

presenters

…

serializers

Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream

2024-05-01 19:30:41 +02:00

services

Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream

2024-05-01 17:22:02 +02:00

validators

Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream

2024-05-01 17:30:52 +02:00

views

Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream

2024-05-01 19:38:34 +02:00

workers

Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream

2024-05-01 17:22:02 +02:00