From 1c61869eed0ac91fbada1da8ed729928779ecd76 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 28 Apr 2023 10:01:38 +0200
Subject: [PATCH] Fix /api/v1/custom_emojis being cached even when
unauthenticated API access is disallowed (#24665)
---
app/controllers/api/v1/custom_emojis_controller.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/api/v1/custom_emojis_controller.rb b/app/controllers/api/v1/custom_emojis_controller.rb
index d4e7c43cb0..76bc2b18ad 100644
--- a/app/controllers/api/v1/custom_emojis_controller.rb
+++ b/app/controllers/api/v1/custom_emojis_controller.rb
@@ -1,10 +1,10 @@
# frozen_string_literal: true
class Api::V1::CustomEmojisController < Api::BaseController
- vary_by ''
+ vary_by '', unless: :disallow_unauthenticated_api_access?
def index
- cache_even_if_authenticated!
+ cache_even_if_authenticated! unless disallow_unauthenticated_api_access?
render_with_cache(each_serializer: REST::CustomEmojiSerializer) { CustomEmoji.listed.includes(:category) }
end
end
--
GitLab