diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 15:06:32 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 15:06:32 +0000 |
commit | 6f9edd1a4c4942d3d13ec54793cfae56164b1a0a (patch) | |
tree | f118f4a1dcad2db7b35ab15157e16eef56eba860 /app/models/clusters/cluster.rb | |
parent | 94e614c94c0a42e261e6af88c89461d90f3330c0 (diff) | |
download | gitlab-ce-6f9edd1a4c4942d3d13ec54793cfae56164b1a0a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/clusters/cluster.rb')
-rw-r--r-- | app/models/clusters/cluster.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index 2df30e8ac36..49bed479c02 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -172,7 +172,7 @@ module Clusters persisted_namespace = Clusters::KubernetesNamespaceFinder.new( self, project: project, - environment_slug: environment.slug + environment_name: environment.name ).execute persisted_namespace&.namespace || Gitlab::Kubernetes::DefaultNamespace.new(self, project: project).from_environment_slug(environment.slug) |