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

Conflicts:
- `app/controllers/relationships_controller.rb`:
  Upstream changed a line too close to a glitch-soc only line related to
  glitch-soc's theming system.
  Applied upstream changes accordingly.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/relationships_controller.rb
index f1ab980c88b3e1ac44f696074ae560a1013d2200,96cce55e9e4f6ecf30066d16f169113086a2607b..d40770726c42111da068a9ad3d9e08239c3b5dac
--- 1/app/controllers/relationships_controller.rb
--- 2/app/controllers/relationships_controller.rb
+++ b/app/controllers/relationships_controller.rb
@@@ -5,7 -5,7 +5,8 @@@ class RelationshipsController < Applica
  
    before_action :authenticate_user!
    before_action :set_accounts, only: :show
 +  before_action :set_pack
+   before_action :set_relationships, only: :show
    before_action :set_body_classes
  
    helper_method :following_relationship?, :followed_by_relationship?, :mutual_relationship?

diff --cc app/helpers/application_helper.rb
Simple merge

diff --cc app/javascript/mastodon/actions/compose.js
Simple merge

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

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

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge