diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-09-28 16:59:49 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-09-28 16:59:49 -0500 |
| commit | 3468ca835d6b5f410ffeba3bbe3964371ef8349f (patch) | |
| tree | 2d5c7dcf052696ec96ef77a65db6616368d9a405 /spec/support/test_env.rb | |
| parent | c8596aa9152169c761faaa69f7d85ee5edb829f2 (diff) | |
| parent | 3d899a7d2ecc6a815a4c6d0885ff3d24dba74f3c (diff) | |
| download | gitlab-ce-3468ca835d6b5f410ffeba3bbe3964371ef8349f.tar.gz | |
Merge branch 'master' into ff_port_from_ee
Conflicts:
app/models/project.rb
db/schema.rb
Diffstat (limited to 'spec/support/test_env.rb')
| -rw-r--r-- | spec/support/test_env.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 126ea859101..79395f4c564 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -307,6 +307,9 @@ module TestEnv ensure_component_dir_name_is_correct!(component, install_dir) + # On CI, once installed, components never need update + return if File.exist?(install_dir) && ENV['CI'] + if component_needs_update?(install_dir, version) # Cleanup the component entirely to ensure we start fresh FileUtils.rm_rf(install_dir) |