Claire 2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.

2023-08-22 18:31:28 +02:00

..

migrate

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

2023-08-22 18:31:28 +02:00

post_migrate

Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream

2023-08-21 21:07:39 +02:00

seeds

Use valid email address for first account (#26114)

2023-07-23 15:58:19 +02:00

views

Fix some old migration scripts (#17394)

2022-01-30 21:38:54 +01:00

schema.rb

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

2023-08-22 18:31:28 +02:00

seeds.rb

Drop EOL Ruby 2.7 (#24237)

2023-04-27 01:46:18 +02:00