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 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.		6 years ago
..
account_moderation_notes_controller.rb	…
accounts_controller.rb	Add admin ability to remove an user's header image (#9495)	6 years ago
action_logs_controller.rb	…
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
change_emails_controller.rb	…
confirmations_controller.rb	Move #set_user to Admin::BaseController (#9470)	6 years ago
custom_emojis_controller.rb	…
dashboard_controller.rb	Add instance-wide setting to disable profile directory (#9497)	6 years ago
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	Move #set_user to Admin::BaseController (#9470)	6 years ago
roles_controller.rb	Move #set_user to Admin::BaseController (#9470)	6 years ago
settings_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
silences_controller.rb	…
statuses_controller.rb	…
subscriptions_controller.rb	…
suspensions_controller.rb	…
tags_controller.rb	Fix Admin::TagsController#unhide (#9481)	6 years ago
two_factor_authentications_controller.rb	Move #set_user to Admin::BaseController (#9470)	6 years ago