From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 12 Nov 2020 21:13:57 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c077cdaba70eac154909cad412ece409acc2e688;p=mastodon.git

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.
---

c077cdaba70eac154909cad412ece409acc2e688
diff --cc app/controllers/relationships_controller.rb
index f1ab980c8,96cce55e9..d40770726
--- a/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?