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. |
||
|---|---|---|
| .. | ||
| exports | ||
| two_factor_authentication | ||
| applications_controller.rb | ||
| base_controller.rb | ||
| deletes_controller.rb | ||
| exports_controller.rb | ||
| flavours_controller.rb | ||
| follower_domains_controller.rb | ||
| imports_controller.rb | ||
| migrations_controller.rb | ||
| notifications_controller.rb | ||
| preferences_controller.rb | ||
| profiles_controller.rb | ||
| sessions_controller.rb | ||
| two_factor_authentications_controller.rb | ||