mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-27 09:21:38 +01: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. |
||
|---|---|---|
| .. | ||
| credentials_controller.rb | ||
| familiar_followers_controller.rb | ||
| featured_tags_controller.rb | ||
| follower_accounts_controller.rb | ||
| following_accounts_controller.rb | ||
| identity_proofs_controller.rb | ||
| lists_controller.rb | ||
| lookup_controller.rb | ||
| notes_controller.rb | ||
| pins_controller.rb | ||
| relationships_controller.rb | ||
| search_controller.rb | ||
| statuses_controller.rb | ||