summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-06-01 12:50:30 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-06-01 12:50:30 +0000
commitccf052905c2abd5a2f9b013310b00a277cbd7c11 (patch)
treee7f58594a905b05aca182bb4511a4bb1029b48ce /spec
parentafb2d667cae42b77e090b4b240848c4d4ddcaf2d (diff)
parent6ee0acbc5599c0dc6a3c4ae9860cf924553f8af4 (diff)
downloadgitlab-ce-ccf052905c2abd5a2f9b013310b00a277cbd7c11.tar.gz
Merge branch 'backup-delete-all-use-file-join' into 'master'
Use File.join in DeleteAllRepositories test Closes #47108 See merge request gitlab-org/gitlab-ce!19310
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/backup/repository_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/backup/repository_spec.rb b/spec/lib/backup/repository_spec.rb
index 023bedaaebb..f583b2021a2 100644
--- a/spec/lib/backup/repository_spec.rb
+++ b/spec/lib/backup/repository_spec.rb
@@ -92,7 +92,7 @@ describe Backup::Repository do
end
def list_repositories
- Dir[SEED_STORAGE_PATH + '/*.git']
+ Dir[File.join(SEED_STORAGE_PATH, '*.git')]
end
end