Merge branch 'master' into glitch-soc/merge-upstream

diff --cc Gemfile.lock
Simple merge

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

diff --cc app/views/settings/profiles/show.html.haml
Simple merge

diff --cc app/views/tags/show.html.haml
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc yarn.lock
Simple merge