mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-25 06:36:45 +00:00
221580a3af
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. |
||
---|---|---|
.. | ||
account_associations.rb | ||
account_avatar.rb | ||
account_counters.rb | ||
account_finder_concern.rb | ||
account_header.rb | ||
account_interactions.rb | ||
account_merging.rb | ||
attachmentable.rb | ||
cacheable.rb | ||
domain_materializable.rb | ||
domain_normalizable.rb | ||
expireable.rb | ||
follow_limitable.rb | ||
ldap_authenticable.rb | ||
lockable.rb | ||
omniauthable.rb | ||
paginable.rb | ||
pam_authenticable.rb | ||
rate_limitable.rb | ||
redisable.rb | ||
relationship_cacheable.rb | ||
remotable.rb | ||
status_snapshot_concern.rb | ||
status_threading_concern.rb |