mirror of https://github.com/tootsuite/mastodon
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_moderation_notes_controller.rb | ||
| accounts_controller.rb | ||
| action_logs_controller.rb | ||
| base_controller.rb | ||
| change_emails_controller.rb | ||
| confirmations_controller.rb | ||
| custom_emojis_controller.rb | ||
| dashboard_controller.rb | ||
| domain_blocks_controller.rb | ||
| email_domain_blocks_controller.rb | ||
| instances_controller.rb | ||
| invites_controller.rb | ||
| relays_controller.rb | ||
| report_notes_controller.rb | ||
| reported_statuses_controller.rb | ||
| reports_controller.rb | ||
| resets_controller.rb | ||
| roles_controller.rb | ||
| settings_controller.rb | ||
| silences_controller.rb | ||
| statuses_controller.rb | ||
| subscriptions_controller.rb | ||
| suspensions_controller.rb | ||
| two_factor_authentications_controller.rb | ||