From 0663803348440cc4b66f061801259dc10c0ad83d Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Sat, 25 Mar 2023 19:40:01 -0400
Subject: [PATCH] Move link header setting to after_action (#24251)
---
app/controllers/concerns/account_controller_concern.rb | 3 ++-
app/controllers/statuses_controller.rb | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/controllers/concerns/account_controller_concern.rb b/app/controllers/concerns/account_controller_concern.rb
index 2f7d84df04..e9cff22ca8 100644
--- a/app/controllers/concerns/account_controller_concern.rb
+++ b/app/controllers/concerns/account_controller_concern.rb
@@ -10,7 +10,8 @@ module AccountControllerConcern
included do
before_action :set_instance_presenter
- before_action :set_link_headers, if: -> { request.format.nil? || request.format == :html }
+
+ after_action :set_link_headers, if: -> { request.format.nil? || request.format == :html }
end
private
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index fcb3cd4fa3..d369cd8e6d 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -9,11 +9,12 @@ class StatusesController < ApplicationController
before_action :require_account_signature!, only: [:show, :activity], if: -> { request.format == :json && authorized_fetch_mode? }
before_action :set_status
before_action :set_instance_presenter
- before_action :set_link_headers
before_action :redirect_to_original, only: :show
before_action :set_cache_headers
before_action :set_body_classes, only: :embed
+ after_action :set_link_headers
+
skip_around_action :set_locale, if: -> { request.format == :json }
skip_before_action :require_functional!, only: [:show, :embed], unless: :whitelist_mode?
--
GitLab