summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-03-16 18:22:14 +0000
committerRémy Coutable <remy@rymai.me>2017-03-16 18:22:14 +0000
commitac8beca42399fd36b471c63ea1dfe8ad0e48ed8f (patch)
treea2871c27b1113e2678b394a38c5ca1a7817f843c /lib
parent2668cc2029d0d337fc9f999dde7416d14d6cbec2 (diff)
parent45976540799e34fa07e7830ed52a7d6616cde3d7 (diff)
downloadgitlab-ce-ac8beca42399fd36b471c63ea1dfe8ad0e48ed8f.tar.gz
Merge branch '29565-name-of-the-uncompressed-folder-of-a-tag-archive-changed' into 'master'
Fix archive prefix bug for refs containing dots Closes #29565 See merge request !10007
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/repository.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 228ef7bb7a9..2187dd70ff4 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -201,7 +201,7 @@ module Gitlab
def archive_prefix(ref, sha)
project_name = self.name.chomp('.git')
- "#{project_name}-#{ref.parameterize}-#{sha}"
+ "#{project_name}-#{ref.tr('/', '-')}-#{sha}"
end
def archive_metadata(ref, storage_path, format = "tar.gz")