]> cat aescling's git repositories - mastodon.git/commitdiff
Fix relationships controller/view wrt. glitch-soc theming engine
authorThibaut Girka <thib@sitedethib.com>
Sat, 16 Mar 2019 13:26:14 +0000 (14:26 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sat, 16 Mar 2019 13:26:14 +0000 (14:26 +0100)
app/controllers/relationships_controller.rb
app/views/relationships/show.html.haml

index e6dd65e4455f7b7c5bb71f8b6d4ec28e059b6024..af91cb65842b143cc9a8f94fd57e015c619a1eb5 100644 (file)
@@ -5,6 +5,7 @@ class RelationshipsController < ApplicationController
 
   before_action :authenticate_user!
   before_action :set_accounts, only: :show
+  before_action :set_pack
   before_action :set_body_classes
 
   helper_method :following_relationship?, :followed_by_relationship?, :mutual_relationship?
@@ -95,4 +96,8 @@ class RelationshipsController < ApplicationController
   def set_body_classes
     @body_classes = 'admin'
   end
+
+  def set_pack
+    use_pack 'admin'
+  end
 end
index 33a43f1a87c62d9d1230f50a8886b8ec87146d8d..94972026acddcc5caa3a8fb7c304c59d6610e42d 100644 (file)
@@ -1,9 +1,6 @@
 - content_for :page_title do
   = t('settings.relationships')
 
-- content_for :header_tags do
-  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
-
 .filters
   .filter-subset
     %strong= t 'relationships.relationship'