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
..
_domain_blocks.html.haml	Add option to obfuscate domain name in public list of domain blocks (#15355)	4 years ago
_logged_in.html.haml	Redesign /about when already logged in (#17348)	3 years ago
_login.html.haml	Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)	3 years ago
_registration.html.haml	Change autocomplete type of password input box (#17702)	3 years ago
more.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
show.html.haml	Change brand color and logotypes (#18592)	2 years ago