a4fc7ac922
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. |
||
---|---|---|
.. | ||
accounts_cli.rb | ||
cache_cli.rb | ||
canonical_email_blocks_cli.rb | ||
cli_helper.rb | ||
domains_cli.rb | ||
email_domain_blocks_cli.rb | ||
emoji_cli.rb | ||
feeds_cli.rb | ||
ip_blocks_cli.rb | ||
maintenance_cli.rb | ||
media_cli.rb | ||
migration_helpers.rb | ||
premailer_webpack_strategy.rb | ||
preview_cards_cli.rb | ||
rack_middleware.rb | ||
redis_config.rb | ||
search_cli.rb | ||
settings_cli.rb | ||
sidekiq_middleware.rb | ||
snowflake.rb | ||
statuses_cli.rb | ||
upgrade_cli.rb | ||
version.rb |