Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 15 insertions, 0 deletions

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 217f08dd648..ff6d9350a5c 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -51,6 +51,21 @@ class SearchController < ApplicationController
     render json: { count: count }
   end
 
+  # rubocop: disable CodeReuse/ActiveRecord
+  def autocomplete
+    term = params[:term]
+
+    if params[:project_id].present?
+      @project = Project.find_by(id: params[:project_id])
+      @project = nil unless can?(current_user, :read_project, @project)
+    end
+
+    @ref = params[:project_ref] if params[:project_ref].present?
+
+    render json: search_autocomplete_opts(term).to_json
+  end
+  # rubocop: enable CodeReuse/ActiveRecord
+
   private
 
   def preload_method