Merge branch 'cherry-pick-7b8d754e-ce' into 'master'

Adjust spec to build correct path when storage path ends in slash

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

spec/helpers/projects_helper_spec.rb

@@ -283,7 +283,7 @@ describe ProjectsHelper do
     end
 
     it 'removes the repo path' do
-      repo = "#{storage_path}/namespace/test.git"
+      repo = File.join(storage_path, 'namespace/test.git')
       import_error = "Could not clone #{repo}\n"
 
       expect(sanitize_repo_path(project, import_error)).to eq('Could not clone [REPOS PATH]/namespace/test.git')