glitchier-soc

History

Claire 09306d7c3c Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.		3 years ago
..
assets.rake	Override current_user when generating static pages	6 years ago
auto_annotate_models.rake	Add announcements (#12662 )	5 years ago
db.rake	Change index corruption warning to be a little less scary (#17395 )	3 years ago
emojis.rake	Update emoji codepoint mappings to v13.1 (#16352 )	3 years ago
glitchsoc.rake	Add Rake task to backfill local-only flag (#253 )	7 years ago
mastodon.rake	Change mastodon:webpush:generate_vapid_key task to not require functional env (#17338 )	3 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	Add more migration tests (#17710 )	3 years ago