You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		6 years ago
..
_theme.html.haml	…
admin.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
application.html.haml	Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream	6 years ago
auth.html.haml	…
embedded.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
error.html.haml	Hardcode default skin/theme in error layout (fixes #373)	7 years ago
mailer.html.haml	…
mailer.text.erb	…
modal.html.haml	Revert Font Awesome 5 upgrade (#8810)	6 years ago
plain_mailer.html.haml	…
public.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago