about summary refs log tree commit diff
path: root/app/controllers/instance_actors_controller.rb
diff options
context:
space:
mode:
authorReverite <github@reverite.sh>2019-08-20 10:46:41 -0600
committerReverite <github@reverite.sh>2019-08-20 10:46:41 -0600
commitd2c357ba86b1a9d1b7b4c291e1c55811997027ed (patch)
tree229bd4223833900f11701fb232f6ea7b2e4160f1 /app/controllers/instance_actors_controller.rb
parent2e221bd5b6472d1eecb654b3518af7886d3dadaf (diff)
parentbce46f2057b06e78958a42821f3ce18c945de88d (diff)
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/instance_actors_controller.rb')
-rw-r--r--app/controllers/instance_actors_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/instance_actors_controller.rb b/app/controllers/instance_actors_controller.rb
index 41f33602e..6f02d6a35 100644
--- a/app/controllers/instance_actors_controller.rb
+++ b/app/controllers/instance_actors_controller.rb
@@ -3,6 +3,8 @@
 class InstanceActorsController < ApplicationController
   include AccountControllerConcern
 
+  skip_around_action :set_locale
+
   def show
     expires_in 10.minutes, public: true
     render json: @account, content_type: 'application/activity+json', serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter, fields: restrict_fields_to