diff options
author | Stan Hu <stanhu@gmail.com> | 2017-11-02 15:32:22 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2017-11-02 15:35:12 -0700 |
commit | 0b18023c89864b7e38e4dc43cff9f8ad4017c044 (patch) | |
tree | a8ead1328cf7c3ef6226612b4fce0e5b707b8266 /app/models/environment.rb | |
parent | 713052c7255c9c4fc33b74ca5d788644a30018ca (diff) | |
download | gitlab-ce-0b18023c89864b7e38e4dc43cff9f8ad4017c044.tar.gz |
Avoid regenerating the ref path for the environmentsh-fix-environment-slug-generation
Closes #39752
Diffstat (limited to 'app/models/environment.rb')
-rw-r--r-- | app/models/environment.rb | 6 |
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: |