Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

4 files changed, 17 insertions, 40 deletions

diff --git a/app/controllers/groups/autocomplete_sources_controller.rb b/app/controllers/groups/autocomplete_sources_controller.rb
index 414461d9e93..86bf65f4723 100644
--- a/app/controllers/groups/autocomplete_sources_controller.rb
+++ b/app/controllers/groups/autocomplete_sources_controller.rb
@@ -8,6 +8,11 @@ class Groups::AutocompleteSourcesController < Groups::ApplicationController
   urgency :low, [:issues, :labels, :milestones, :commands, :merge_requests, :members]
 
   def members
+    if Feature.enabled?(:cache_autocomplete_sources_members, current_user)
+      # Cache the response on the frontend
+      expires_in 3.minutes
+    end
+
     render json: ::Groups::ParticipantsService.new(@group, current_user).execute(target)
   end
 
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
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index cbed75019f2..5f6b55ea928 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -9,10 +9,6 @@ class Groups::MilestonesController < Groups::ApplicationController
   feature_category :team_planning
   urgency :low
 
-  before_action do
-    push_frontend_feature_flag(:content_editor_on_issues, group)
-  end
-
   def index
     respond_to do |format|
       format.html do
diff --git a/app/controllers/groups/observability_controller.rb b/app/controllers/groups/observability_controller.rb
deleted file mode 100644
index 525407f5849..00000000000
--- a/app/controllers/groups/observability_controller.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-module Groups
-  class ObservabilityController < Groups::ApplicationController
-    include ::Observability::ContentSecurityPolicy
-
-    feature_category :tracing
-
-    before_action :check_observability_allowed
-
-    def dashboards
-      render_observability
-    end
-
-    def manage
-      render_observability
-    end
-
-    def explore
-      render_observability
-    end
-
-    def datasources
-      render_observability
-    end
-
-    private
-
-    def render_observability
-      render 'observability', layout: 'group', locals: { base_layout: 'layouts/fullscreen' }
-    end
-
-    def check_observability_allowed
-      render_404 unless Gitlab::Observability.allowed_for_action?(current_user, group, params[:action])
-    end
-  end
-end