Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/auth/registrations_controller.rb
Simple merge

diff --cc app/controllers/statuses_controller.rb
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc app/views/layouts/application.html.haml
Simple merge

diff --cc config/application.rb
Simple merge