You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.		2 years ago
..
_theme.html.haml	Fix missing media: 'all' on default skins	3 years ago
admin.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
auth.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
embedded.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
error.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
mailer.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mailer.text.erb	Replace tutorial modal with welcome e-mail (#6273)	7 years ago
modal.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
plain_mailer.html.haml	HTML e-mails for UserMailer (#6256)	7 years ago
public.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago