mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-25 00:05:20 +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. |
||
|---|---|---|
| .. | ||
| accept_spec.rb | ||
| add_spec.rb | ||
| announce_spec.rb | ||
| block_spec.rb | ||
| create_spec.rb | ||
| delete_spec.rb | ||
| flag_spec.rb | ||
| follow_spec.rb | ||
| like_spec.rb | ||
| move_spec.rb | ||
| reject_spec.rb | ||
| remove_spec.rb | ||
| undo_spec.rb | ||
| update_spec.rb | ||