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
..
assets.rake	Override current_user when generating static pages	6 years ago
auto_annotate_models.rake	Add announcements (#12662)	5 years ago
branding.rake	Fix wrong aspect ratio of logo in icons (#18639)	2 years ago
db.rake	Fix null values being included in some indexes (#17711)	3 years ago
emojis.rake	Fix light-mode emoji borders. (#18131)	3 years ago
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	7 years ago
mastodon.rake	Fix typos (#18604)	2 years ago
repo.rake	Remove language detection through cld3 (#17478)	3 years ago
statistics.rake	add task to report code statistics (#2489)	8 years ago
tests.rake	Revamp post filtering system (#18058)	2 years ago