Merge branch 'sh-fix-environment-slug-generation' into 'master'

Avoid regenerating the ref path for the environment

Closes #39752

See merge request gitlab-org/gitlab-ce!15167

1 files changed, 5 insertions, 1 deletions

diff --git a/app/models/environment.rb b/app/models/environment.rb
index e613d21add6..8d6b0a32c13 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -110,7 +110,7 @@ class Environment < ActiveRecord::Base
   end
 
   def ref_path
-    "refs/#{Repository::REF_ENVIRONMENTS}/#{generate_slug}"
+    "refs/#{Repository::REF_ENVIRONMENTS}/#{slug}"
   end
 
   def formatted_external_url
@@ -164,6 +164,10 @@ class Environment < ActiveRecord::Base
     end
   end
 
+  def slug
+    super.presence || generate_slug
+  end
+
   # An environment name is not necessarily suitable for use in URLs, DNS
   # or other third-party contexts, so provide a slugified version. A slug has
   # the following properties: