mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-27 07:46:29 +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. |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| announcements | ||
| apps | ||
| emails | ||
| filters | ||
| instances | ||
| lists | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| trends | ||
| accounts_controller_spec.rb | ||
| announcements_controller_spec.rb | ||
| apps_controller_spec.rb | ||
| blocks_controller_spec.rb | ||
| bookmarks_controller_spec.rb | ||
| conversations_controller_spec.rb | ||
| custom_emojis_controller_spec.rb | ||
| domain_blocks_controller_spec.rb | ||
| endorsements_controller_spec.rb | ||
| favourites_controller_spec.rb | ||
| filters_controller_spec.rb | ||
| follow_requests_controller_spec.rb | ||
| followed_tags_controller_spec.rb | ||
| instances_controller_spec.rb | ||
| lists_controller_spec.rb | ||
| markers_controller_spec.rb | ||
| media_controller_spec.rb | ||
| mutes_controller_spec.rb | ||
| notifications_controller_spec.rb | ||
| polls_controller_spec.rb | ||
| reports_controller_spec.rb | ||
| statuses_controller_spec.rb | ||
| streaming_controller_spec.rb | ||
| suggestions_controller_spec.rb | ||
| tags_controller_spec.rb | ||