mirror of
https://github.com/funamitech/mastodon
synced 2024-12-03 17:28:35 +09:00
5bb8563f6c
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead. |
||
|---|---|---|
| .. | ||
| account/components | ||
| account_gallery | ||
| account_timeline | ||
| blocks | ||
| community_timeline | ||
| compose | ||
| direct_timeline | ||
| domain_blocks | ||
| emoji | ||
| favourited_statuses | ||
| favourites | ||
| follow_requests | ||
| followers | ||
| following | ||
| generic_not_found | ||
| getting_started | ||
| hashtag_timeline | ||
| home_timeline | ||
| keyboard_shortcuts | ||
| list_editor | ||
| list_timeline | ||
| lists | ||
| mutes | ||
| notifications | ||
| pinned_statuses | ||
| public_timeline | ||
| reblogs | ||
| report | ||
| standalone | ||
| status | ||
| ui | ||
| video | ||