From 46b97c982607f7a7a92caf2d40c94b90cfb1714f Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sun, 7 May 2023 23:15:28 +0200
Subject: [PATCH] Remove failing skip_before_action from
 v1/custom_emojis_controller.rb

Fixes incorrect merge at 9eb149477a24daf6e17a72ef550c76d4cf6ad506
---
 app/controllers/api/v1/custom_emojis_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/api/v1/custom_emojis_controller.rb b/app/controllers/api/v1/custom_emojis_controller.rb
index a29c4c1c65..4c056c952e 100644
--- a/app/controllers/api/v1/custom_emojis_controller.rb
+++ b/app/controllers/api/v1/custom_emojis_controller.rb
@@ -2,7 +2,6 @@
 
 class Api::V1::CustomEmojisController < Api::BaseController
   vary_by '', unless: :disallow_unauthenticated_api_access?
-  skip_before_action :set_cache_headers
   skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
 
   def index