tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
759750801e
mastodon/app/controllers/settings
History
Thibaut Girka 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream 
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.
2018-10-26 20:41:43 +02:00
..
exports Remove exports/base controller in favor of shared concern (#3444) 2017-05-30 19:06:01 +02:00
two_factor_authentication Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
applications_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
base_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
deletes_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
exports_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
flavours_controller.rb Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
follower_domains_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
imports_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
migrations_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
notifications_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
preferences_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
profiles_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00
sessions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
two_factor_authentications_controller.rb Set @body_classes to admin layout (#9081) 2018-10-25 00:10:01 +02:00