Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 4 deletions

diff --git a/app/finders/clusters/kubernetes_namespace_finder.rb b/app/finders/clusters/kubernetes_namespace_finder.rb
index e947796c1e7..82df96ed79e 100644
--- a/app/finders/clusters/kubernetes_namespace_finder.rb
+++ b/app/finders/clusters/kubernetes_namespace_finder.rb
@@ -2,12 +2,12 @@
 
 module Clusters
   class KubernetesNamespaceFinder
-    attr_reader :cluster, :project, :environment_slug
+    attr_reader :cluster, :project, :environment_name
 
-    def initialize(cluster, project:, environment_slug:, allow_blank_token: false)
+    def initialize(cluster, project:, environment_name:, allow_blank_token: false)
       @cluster = cluster
       @project = project
-      @environment_slug = environment_slug
+      @environment_name = environment_name
       @allow_blank_token = allow_blank_token
     end
 
@@ -20,7 +20,11 @@ module Clusters
     attr_reader :allow_blank_token
 
     def find_namespace(with_environment:)
-      relation = with_environment ? namespaces.with_environment_slug(environment_slug) : namespaces
+      relation = if with_environment
+                   namespaces.with_environment_name(environment_name)
+                 else
+                   namespaces
+                 end
 
       relation.find_by_project_id(project.id)
     end