Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 8 insertions, 2 deletions

diff --git a/app/finders/environments/environments_finder.rb b/app/finders/environments/environments_finder.rb
index f2dcba04349..85cd37c267e 100644
--- a/app/finders/environments/environments_finder.rb
+++ b/app/finders/environments/environments_finder.rb
@@ -41,7 +41,13 @@ module Environments
 
     def by_search(environments)
       if params[:search].present?
-        environments.for_name_like(params[:search], limit: nil)
+        if Feature.enabled?(:enable_environments_search_within_folder, project)
+          Environment.from_union(
+            environments.for_name_like(params[:search], limit: nil),
+            environments.for_name_like_within_folder(params[:search], limit: nil))
+        else
+          environments.for_name_like(params[:search], limit: nil)
+        end
       else
         environments
       end
@@ -57,7 +63,7 @@ module Environments
 
     def by_ids(environments)
       if params[:environment_ids].present?
-        environments.for_id(params[:environment_ids])
+        environments.id_in(params[:environment_ids])
       else
         environments
       end