From 41310fed8a373f2869cdd5946605e28a977706f1 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 29 Sep 2023 03:13:40 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/controllers/groups/custom_emoji_controller.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 app/controllers/groups/custom_emoji_controller.rb

(limited to 'app/controllers')

diff --git a/app/controllers/groups/custom_emoji_controller.rb b/app/controllers/groups/custom_emoji_controller.rb
new file mode 100644
index 00000000000..f202c9febba
--- /dev/null
+++ b/app/controllers/groups/custom_emoji_controller.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Groups
+  class CustomEmojiController < Groups::ApplicationController
+    feature_category :code_review_workflow
+    urgency :low
+
+    before_action do
+      render_404 unless Feature.enabled?(:custom_emoji)
+    end
+  end
+end
-- 
cgit v1.2.3