summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-10-24 09:22:21 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-10-24 09:22:21 +0000
commit3dcdd4a1e8533cac55805d2242446cb2e12b21e9 (patch)
tree8c203737eaaf770aab00a16def7cfbe8e02012a3 /app
parent3548dc4b29ab374f2345b6e30204f036953e589e (diff)
parent3bff85a4f659438edbbc486a0b3c32ff589ab299 (diff)
downloadgitlab-ce-3dcdd4a1e8533cac55805d2242446cb2e12b21e9.tar.gz
Merge branch 'sh-fix-environment-write-ref' into 'master'
Fix the writing of invalid environment refs Closes #39182 See merge request gitlab-org/gitlab-ce!14993
Diffstat (limited to 'app')
-rw-r--r--app/models/environment.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb
index b6868ccbe8f..e613d21add6 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}/#{Shellwords.shellescape(name)}"
+ "refs/#{Repository::REF_ENVIRONMENTS}/#{generate_slug}"
end
def formatted_external_url