diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-05-10 16:00:33 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-05-10 16:00:33 +0000 |
| commit | d77433a8ff87959d1e7bafd5aca093975106b891 (patch) | |
| tree | 18913b14f8bcec7adf57e8abb36c880f6ccb23f3 /spec/helpers | |
| parent | f6e47f6f222380eead684ae8ba0ae522f7fcd789 (diff) | |
| parent | 0afcfd31bdf8d23bc180d5a36796aba8e66dbd33 (diff) | |
| download | gitlab-ce-d77433a8ff87959d1e7bafd5aca093975106b891.tar.gz | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/shared/runners/_form.html.haml
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/projects_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb index 8fcb175416f..f8877b6d1aa 100644 --- a/spec/helpers/projects_helper_spec.rb +++ b/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') |